Merge remote-tracking branch 'l3/ACP2E-294' into PR_L3_22_04_2022

Author: veloraven

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -34,8 +34,8 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $export->filterAttributeCollection(
-                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                $attrFilterBlock->prepareCollection(
+                    $export->filterAttributeCollection($export->getEntityAttributeCollection())
                 );
                 return $resultLayout;
             } catch (\Exception $e) {

app/code/Magento/CatalogImportExport/Model/Export/Product/CategoryFilter.php

@@ -25,6 +25,7 @@ public function filter(Collection $collection, array $filters): Collection
         $value = trim($filters[self::NAME] ?? '');
         if ($value) {
             $collection->addCategoriesFilter(['in' => explode(',', $value)]);
+            $collection->setFlag(self::NAME . '_filter_applied');
         }
         return $collection;
     }

app/code/Magento/CatalogImportExport/Model/Export/Product/StockStatusFilter.php

@@ -48,9 +48,11 @@ public function filter(Collection $collection, array $filters): Collection
         switch ($value) {
             case self::IN_STOCK:
                 $this->stockHelper->addInStockFilterToCollection($collection);
+                $collection->setFlag(self::NAME . '_filter_applied');
                 break;
             case self::OUT_OF_STOCK:
                 $this->stockHelper->addOutOfStockFilterToCollection($collection);
+                $collection->setFlag(self::NAME . '_filter_applied');
                 break;
         }
         return $collection;

app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php

@@ -33,7 +33,6 @@ class Simple extends \Magento\CatalogImportExport\Model\Export\Product\Type\Abst
     protected $_disabledAttrs = [
         'old_id',
         'tier_price',
-        'category_ids',
         'has_options',
         'is_returnable',
         'required_options',

app/code/Magento/CatalogImportExport/Model/Export/Product/WebsiteFilter.php

@@ -27,6 +27,7 @@ public function filter(Collection $collection, array $filters): Collection
         }
 
         $collection->addWebsiteFilter($filters[self::NAME]);
+        $collection->setFlag(self::NAME . '_filter_applied');
 
         return $collection;
     }

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php

@@ -11,6 +11,7 @@
 /**
  * Export entity abstract model
  *
+ * phpcs:ignore Magento2.Classes.AbstractApi
  * @api
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -48,8 +49,6 @@ abstract class AbstractEntity
     protected $_disabledAttrs = [];
 
     /**
-     * Entity type id.
-     *
      * @var int
      */
     protected $_entityTypeId;
@@ -97,8 +96,6 @@ abstract class AbstractEntity
     protected $_messageTemplates = [];
 
     /**
-     * Parameters.
-     *
      * @var array
      */
     protected $_parameters = [];
@@ -175,8 +172,10 @@ public function __construct(
     protected function _initStores()
     {
         foreach ($this->_storeManager->getStores(true) as $store) {
+            // phpstan:ignore "Access to an undefined property"
             $this->_storeIdToCode[$store->getId()] = $store->getCode();
         }
+        // phpstan:ignore "Access to an undefined property"
         ksort($this->_storeIdToCode);
         // to ensure that 'admin' store (ID is zero) goes first
 
@@ -251,6 +250,8 @@ protected function _initAttrValues()
      * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
      * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection\AbstractCollection $collection)
     {
@@ -269,6 +270,11 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
         foreach ($this->filterAttributeCollection($this->getAttributeCollection()) as $attribute) {
             $attrCode = $attribute->getAttributeCode();
 
+            $filterFlagName = $attrCode . '_filter_applied';
+            if ($collection->hasFlag($filterFlagName)) {
+                continue;
+            }
+
             // filter applying
             if (isset($exportFilter[$attrCode])) {
                 $attrFilterType = \Magento\ImportExport\Model\Export::getAttributeFilterType($attribute);
@@ -320,13 +326,17 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
                         }
                     }
                 }
+
+                $collection->setFlag($filterFlagName);
             }
+
             if (in_array($attrCode, $exportAttrCodes)) {
                 $collection->addAttributeToSelect($attrCode);
             }
         }
         return $collection;
     }
+    //phpcs:enable Generic.Metrics.NestingLevel
 
     /**
      * Add error with corresponding current data source row number.
@@ -340,6 +350,7 @@ public function addRowError($errorCode, $errorRowNum)
         $errorCode = (string)$errorCode;
         $this->_errors[$errorCode][] = $errorRowNum + 1;
         // one added for human readability
+        // phpstan:ignore "Access to an undefined property"
         $this->_invalidRows[$errorRowNum] = true;
         $this->_errorsCount++;
 
@@ -432,6 +443,7 @@ public function getAttributeOptions(\Magento\Eav\Model\Entity\Attribute\Abstract
                         }
                     }
                 }
+                // phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\Exception $e) {
                 // ignore exceptions connected with source models
             }
@@ -496,6 +508,7 @@ public function getErrorsCount()
      */
     public function getInvalidRowsCount()
     {
+        // phpstan:ignore "Access to an undefined property"
         return count($this->_invalidRows);
     }
 
@@ -561,6 +574,7 @@ public function setWriter(AbstractAdapter $writer)
 
     /**
      * Clean cached values
+     *
      * @since 100.1.2
      */
     public function __destruct()

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

@@ -9,7 +9,9 @@
 namespace Magento\CatalogImportExport\Model\Export;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as ProductAttributeCollection;
 use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
+use Magento\CatalogImportExport\Model\Export\Product\Type\Simple as SimpleProductType;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 
 /**
@@ -711,6 +713,24 @@ public function testExportProductWithRestrictedWebsite(): void
         $this->assertStringNotContainsString('"Virtual Product With Custom Options"', $exportData);
     }
 
+    public function testFilterAttributeCollection(): void
+    {
+        $collection = $this->objectManager->create(ProductAttributeCollection::class);
+        $collection = $this->model->filterAttributeCollection($collection);
+        $attributes = [];
+        foreach ($collection->getItems() as $attribute) {
+            $attributes[] = $attribute->getAttributeCode();
+        }
+
+        $simpleProductType = $this->objectManager->create(SimpleProductType::class);
+        $disabledAttributes = $simpleProductType->getDisabledAttrs();
+        $this->assertEmpty(
+            array_intersect($disabledAttributes, $attributes),
+            'Disabled attributes are not filtered.'
+        );
+        $this->assertContains('category_ids', $attributes);
+    }
+
     /**
      * Perform export
      *