MAGETWO-60424: Remove Acl cache usage in Acl Builder

- CR notices

Author: rganin

app/code/Magento/Authorization/Model/ResourceModel/Rules.php

@@ -25,7 +25,8 @@ class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * Acl object cache
      *
      * @var \Magento\Framework\Acl\CacheInterface
-     * @deprecated
+     * @deprecated since 2.2 due to native serialization elimination.
+     * Use data cache \Magento\Framework\Acl\Data\CacheInterface instead.
      */
     protected $_aclCache;
 

app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php

@@ -9,6 +9,9 @@
 /**
  * Unit test for Rules resource model.
  *
+ * Covers control flow logic.
+ * The resource saving is covered with integration test in \Magento\Authorization\Model\RulesTest.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RulesTest extends \PHPUnit_Framework_TestCase

app/code/Magento/User/Model/ResourceModel/User.php

@@ -19,7 +19,8 @@ class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * @var \Magento\Framework\Acl\CacheInterface
-     * @deprecated
+     * @deprecated since 2.2 due to native serialization elimination.
+     * Use data cache \Magento\Framework\Acl\Data\CacheInterface instead.
      */
     protected $_aclCache;
 

app/etc/di.xml

@@ -157,6 +157,11 @@
     <preference for="Magento\Framework\DataObject\IdentityGeneratorInterface" type="Magento\Framework\DataObject\IdentityService" />
     <preference for="Magento\Framework\Serialize\SerializerInterface" type="Magento\Framework\Serialize\Serializer\Json" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
+    <type name="Magento\Framework\Acl\Data\Cache">
+        <arguments>
+            <argument name="aclBuilder" xsi:type="object">Magento\Framework\Acl\Builder\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Logger\Handler\Base">
         <arguments>
             <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>

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

@@ -11,6 +11,7 @@
  * Class Cache
  * @package Magento\Framework\Acl
  * @deprecated due to elimination of native PHP unserialization usage in 2.2.
+ * Use data cache \Magento\Framework\Acl\Data\CacheInterface instead.
  */
 class Cache implements CacheInterface
 {

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

@@ -10,6 +10,7 @@
  *
  * @api
  * @deprecated due to elimination of native PHP unserialization usage in 2.2.
+ * Use data cache \Magento\Framework\Acl\Data\CacheInterface instead.
  */
 interface CacheInterface
 {

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

@@ -36,12 +36,12 @@ class Cache implements CacheInterface
      * Cache constructor.
      *
      * @param \Magento\Framework\Config\CacheInterface $cache
-     * @param \Magento\Framework\Acl\Builder\Proxy $aclBuilder
+     * @param \Magento\Framework\Acl\Builder $aclBuilder
      * @param string $cacheTag
      */
     public function __construct(
         \Magento\Framework\Config\CacheInterface $cache,
-        \Magento\Framework\Acl\Builder\Proxy $aclBuilder,
+        \Magento\Framework\Acl\Builder $aclBuilder,
         $cacheTag = self::ACL_DATA_CACHE_TAG
     ) {
         $this->cache = $cache;