MAGETWO-62691: [Performance] EAV attributes caching optimization

Author: kandy

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -707,25 +707,13 @@ public function testDeleteById()
     public function testGetList()
     {
         $searchCriteriaMock = $this->getMock(\Magento\Framework\Api\SearchCriteriaInterface::class, [], [], '', false);
-        $attributeCode = 'attribute_code';
         $collectionMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Product\Collection::class,
             [],
             [],
             '',
             false
         );
-        $productAttributeSearchResultsMock = $this->getMockBuilder(ProductAttributeInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getItems'])
-            ->getMockForAbstractClass();
-        $productAttributeMock = $this->getMock(
-            \Magento\Catalog\Api\Data\ProductAttributeInterface::class,
-            [],
-            [],
-            '',
-            false
-        );
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
 

app/code/Magento/Eav/Model/Config.php

@@ -543,11 +543,9 @@ private function createAttribute($model)
      * @deprecated
      * @see \Magento\Eav\Model\Config::getEntityAttributes
      *
-     * @param  mixed $entityType
-     * @param  \Magento\Framework\DataObject $object
+     * @param mixed $entityType
+     * @param \Magento\Framework\DataObject $object
      * @return string[]
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getEntityAttributeCodes($entityType, $object = null)
     {
@@ -560,6 +558,9 @@ public function getEntityAttributeCodes($entityType, $object = null)
      * @param  int|string|Type $entityType
      * @param  \Magento\Framework\DataObject|null $object
      * @return AbstractAttribute[]
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getEntityAttributes($entityType, $object = null)
     {

app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php

@@ -87,15 +87,7 @@ protected function setUp()
         );
     }
 
-    /**
-     * @param boolean $cacheEnabled
-     * @param int $loadCalls
-     * @param int $cachedValue
-     * @param int $unserializeCalls
-     * @dataProvider getAttributeCacheDataProvider
-     * @return void
-     */
-    public function testGetAttributeCache($cacheEnabled, $loadCalls, $unserializeCalls, $cachedValue)
+    public function testGetAttributeCache()
     {
         $attributeData = [
             'attribute_code' => 'attribute_code_1',
@@ -201,7 +193,7 @@ public function getAttributeCacheDataProvider()
      * @dataProvider getAttributeCacheDataProvider
      * @return void
      */
-    public function testGetAttributes($cacheEnabled, $loadCalls, $unserializeCalls, $cachedValue)
+    public function testGetAttributes($cacheEnabled)
     {
         $attributeData = [
             'attribute_code' => 'attribute_code_1',

app/code/Magento/Swatches/Helper/Data.php

@@ -429,6 +429,7 @@ public function getSwatchAttributesAsArray(Product $product)
      */
     public function getSwatchesByOptionsId(array $optionIds)
     {
+        sort($optionIds);
         $cacheKey = implode('-', $optionIds);
         if (!isset($this->swatchesCache[$cacheKey])) {
             /** @var \Magento\Swatches\Model\ResourceModel\Swatch\Collection $swatchCollection */