Merge remote-tracking branch 'tango/MC-20533' into Chaika-PR-2019-11-19

Author: veloraven

app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php

@@ -9,7 +9,6 @@
 use Magento\Catalog\Helper\Product as CatalogProduct;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Layer\Resolver;
-use Magento\Catalog\Model\Layer\Category as CategoryLayer;
 use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -154,7 +153,7 @@ public function getJsonConfig()
         $this->unsetData('allow_products');
         return parent::getJsonConfig();
     }
-    
+
     /**
      * Composes configuration for js price format
      *
@@ -242,9 +241,12 @@ private function getLayeredAttributesIfExists(Product $configurableProduct, arra
 
         $layeredAttributes = [];
 
-        $configurableAttributes = array_map(function ($attribute) {
-            return $attribute->getAttributeCode();
-        }, $configurableAttributes);
+        $configurableAttributes = array_map(
+            function ($attribute) {
+                return $attribute->getAttributeCode();
+            },
+            $configurableAttributes
+        );
 
         $commonAttributeCodes = array_intersect(
             $configurableAttributes,
@@ -257,16 +259,4 @@ private function getLayeredAttributesIfExists(Product $configurableProduct, arra
 
         return $layeredAttributes;
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function getCacheKeyInfo()
-    {
-        $cacheKeyInfo = parent::getCacheKeyInfo();
-        /** @var CategoryLayer $catalogLayer */
-        $catalogLayer = $this->layerResolver->get();
-        $cacheKeyInfo[] = $catalogLayer->getStateKey();
-        return $cacheKeyInfo;
-    }
 }