Merge branch 'MAGETWO-64224-remove-usages-of-attributecache' of github.com:magento-jackalopes/magento2ce into MAGETWO-64224-remove-usages-of-attributecache

Author: Igor Melnikov

app/code/Magento/Customer/Model/Metadata/AddressCachedMetadata.php

@@ -20,11 +20,11 @@ class AddressCachedMetadata extends CachedMetadata implements AddressMetadataInt
     /**
      * Constructor
      *
-     * @param AddressMetadataInterface $metadata
+     * @param AddressMetadata $metadata
      * @param AttributeMetadataCache|null $attributeMetadataCache
      */
     public function __construct(
-        AddressMetadataInterface $metadata,
+        AddressMetadata $metadata,
         AttributeMetadataCache $attributeMetadataCache = null
     ) {
         parent::__construct($metadata, $attributeMetadataCache);

app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php

@@ -20,11 +20,11 @@ class CustomerCachedMetadata extends CachedMetadata implements CustomerMetadataI
     /**
      * Constructor
      *
-     * @param CustomerMetadataInterface $metadata
+     * @param CustomerMetadata $metadata
      * @param AttributeMetadataCache|null $attributeMetadataCache
      */
     public function __construct(
-        CustomerMetadataInterface $metadata,
+        CustomerMetadata $metadata,
         AttributeMetadataCache $attributeMetadataCache = null
     ) {
         parent::__construct($metadata, $attributeMetadataCache);

app/code/Magento/Customer/etc/di.xml

@@ -374,14 +374,4 @@
             <argument name="attributeMetadataCache" xsi:type="object">Magento\Customer\Model\Metadata\AttributeMetadataCache\Proxy</argument>
         </arguments>
     </type>
-    <type name="Magento\Customer\Model\Metadata\CustomerCachedMetadata">
-        <arguments>
-            <argument name="metadata" xsi:type="object">Magento\Customer\Api\CustomerMetadataInterface\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Customer\Model\Metadata\AddressCachedMetadata">
-        <arguments>
-            <argument name="metadata" xsi:type="object">Magento\Customer\Api\AddressMetadataInterface\Proxy</argument>
-        </arguments>
-    </type>
 </config>