ACP2E-3752: Duplicate of AC-13913 - Static attribute cleaning asynchronously.

Author: dhorytskyi

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -1,17 +1,19 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\BundleImportExport\Test\Unit\Model\Import\Product\Type;
 
 use Magento\BundleImportExport\Model\Import\Product\Type\Bundle;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as ProductAttributeCollection;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as ProductAttributeCollectionFactory;
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
@@ -34,46 +36,46 @@ class BundleTest extends AbstractImportTestCase
     /**
      * @var Bundle
      */
-    protected $bundle;
+    private $bundle;
 
     /**
      * @var ResourceConnection|MockObject
      */
-    protected $resource;
+    private $resource;
 
     /**
      * @var Select|MockObject
      */
-    protected $select;
+    private $select;
 
     /**
      * @var Product|MockObject
      */
-    protected $entityModel;
+    private $entityModel;
 
     /**
      * @var []
      */
-    protected $params;
+    private $params;
 
     /** @var AdapterInterface|MockObject
      */
-    protected $connection;
+    private $connection;
 
     /**
-     * @var MockObject
+     * @var AttributeSetCollectionFactory|MockObject
      */
-    protected $attrSetColFac;
+    private $attrSetColFac;
 
     /**
-     * @var MockObject
+     * @var ProductAttributeCollectionFactory|MockObject
      */
-    protected $prodAttrColFac;
+    private $prodAttrColFac;
 
     /**
      * @var Collection|MockObject
      */
-    protected $setCollection;
+    private $setCollection;
 
     /**
      * @var ScopeResolverInterface|MockObject
@@ -179,36 +181,20 @@ protected function setUp(): void
         );
         $this->resource->expects($this->any())->method('getConnection')->willReturn($this->connection);
         $this->resource->expects($this->any())->method('getTableName')->willReturn('tableName');
-        $this->attrSetColFac = $this->createPartialMock(
-            CollectionFactory::class,
-            ['create']
-        );
-        $this->setCollection = $this->createPartialMock(
-            Collection::class,
-            ['setEntityTypeFilter']
-        );
-        $this->attrSetColFac->expects($this->any())->method('create')->willReturn(
-            $this->setCollection
-        );
-        $this->setCollection->expects($this->any())
-            ->method('setEntityTypeFilter')
-            ->willReturn([]);
-        $this->prodAttrColFac = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
-            ['create']
-        );
-        $attrCollection =
-            $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class);
-        $attrCollection->expects($this->any())->method('addFieldToFilter')->willReturn([]);
+        $this->attrSetColFac = $this->createMock(AttributeSetCollectionFactory::class);
+        $this->setCollection = $this->createMock(Collection::class);
+        $this->attrSetColFac->expects($this->any())->method('create')->willReturn($this->setCollection);
+        $this->setCollection->expects($this->any())->method('setEntityTypeFilter')->willReturn([]);
+        $this->prodAttrColFac = $this->createMock(ProductAttributeCollectionFactory::class);
+        $attrCollection = $this->createMock(ProductAttributeCollection::class);
+        $attrCollection->expects($this->any())->method('addFieldToFilter')->willReturnSelf();
+        $attrCollection->expects($this->any())->method('getItems')->willReturn([]);
         $this->prodAttrColFac->expects($this->any())->method('create')->willReturn($attrCollection);
         $this->params = [
             0 => $this->entityModel,
             1 => 'bundle'
         ];
-        $this->scopeResolver = $this->getMockBuilder(ScopeResolverInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getScope'])
-            ->getMockForAbstractClass();
+        $this->scopeResolver = $this->createMock(ScopeResolverInterface::class);
 
         $objects = [
             [

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

@@ -352,45 +352,44 @@ private function attachAttributes(array $attributeIds): void
         $attributes = $attributeIds ? $this->_prodAttrColFac->create()
             ->addFieldToFilter(['main_table.attribute_id'], [['in' => $attributeIds]])
             ->getItems() : [];
+        $attributes = array_filter($attributes, fn ($attribute) => $attribute->getIsVisible());
         if ($this->_forcedAttributesCodes) {
             $attributes += $this->_prodAttrColFac->create()
                 ->addFieldToFilter(['main_table.attribute_code'], [['in' => $this->_forcedAttributesCodes]])
                 ->getItems();
         }
 
-        $commonAttributes = $attributeCodeToId = $attributesToLoadFromTable = $invAttributes = [];
+        $invAttributes = array_diff($attributeIds, array_keys($attributes));
+        self::$invAttributesCache = array_merge(self::$invAttributesCache, $invAttributes);
+
+        $commonAttributes = $attributeCodeToId = $attributesToLoadFromTable = [];
         foreach ($attributes as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
             $attributeId = $attribute->getId();
-            if ($attribute->getIsVisible() || in_array($attributeCode, $this->_forcedAttributesCodes)) {
-                $defaultValue = $attribute->getDefaultValue();
-                $cachedAttribute = [
-                    'id' => $attributeId,
-                    'code' => $attributeCode,
-                    'is_global' => $attribute->getIsGlobal(),
-                    'is_required' => $attribute->getIsRequired(),
-                    'is_unique' => $attribute->getIsUnique(),
-                    'frontend_label' => $attribute->getFrontendLabel(),
-                    'is_static' => $attribute->isStatic(),
-                    'apply_to' => $attribute->getApplyTo(),
-                    'type' => Import::getAttributeType($attribute),
-                    'default_value' => is_string($defaultValue) && strlen($defaultValue) ? $defaultValue : null,
-                    'options' => [],
-                ];
-                if (Table::class === $attribute->getSourceModel()) {
-                    $attributesToLoadFromTable[] = $attributeId;
-                } else {
-                    $cachedAttribute['options'] = $this->_entityModel->getAttributeOptions(
-                        $attribute,
-                        $this->_indexValueAttributes
-                    );
-                }
-
-                $commonAttributes[$attributeId] = $cachedAttribute;
-                $attributeCodeToId[$attributeCode] = $attributeId;
+            $defaultValue = $attribute->getDefaultValue();
+            $cachedAttribute = [
+                'id' => $attributeId,
+                'code' => $attributeCode,
+                'is_global' => $attribute->getIsGlobal(),
+                'is_required' => $attribute->getIsRequired(),
+                'is_unique' => $attribute->getIsUnique(),
+                'frontend_label' => $attribute->getFrontendLabel(),
+                'is_static' => $attribute->isStatic(),
+                'apply_to' => $attribute->getApplyTo(),
+                'type' => Import::getAttributeType($attribute),
+                'default_value' => is_string($defaultValue) && strlen($defaultValue) ? $defaultValue : null,
+                'options' => [],
+            ];
+            if (Table::class === $attribute->getSourceModel()) {
+                $attributesToLoadFromTable[] = $attributeId;
             } else {
-                $invAttributes[] = $attributeId;
+                $cachedAttribute['options'] = $this->_entityModel->getAttributeOptions(
+                    $attribute,
+                    $this->_indexValueAttributes
+                );
             }
+            $commonAttributes[$attributeId] = $cachedAttribute;
+            $attributeCodeToId[$attributeCode] = $attributeId;
         }
 
         foreach (array_chunk($attributesToLoadFromTable, 1000) as $ids) {
@@ -407,7 +406,6 @@ private function attachAttributes(array $attributeIds): void
 
         self::$commonAttributesCache += $commonAttributes;
         self::$attributeCodeToId += $attributeCodeToId;
-        self::$invAttributesCache = array_merge(self::$invAttributesCache, $invAttributes);
     }
 
     /**
@@ -636,9 +634,7 @@ public function saveData()
     protected function getMetadataPool()
     {
         if (!$this->metadataPool) {
-            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(MetadataPool::class);
+            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
         }
         return $this->metadataPool;
     }