Merge remote-tracking branch 'origin/ACP2E-4057' into PR_2025_09_08_muntianu

Author: katmoon

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php

@@ -194,13 +194,34 @@ public function isRequiredAttributeValid($attrCode, array $attributeParams, arra
         }
 
         if ($doCheck === true) {
-            return isset($rowData[$attrCode])
-                && strlen(trim($rowData[$attrCode]))
-                && trim($rowData[$attrCode]) !== $this->context->getEmptyAttributeValueConstant();
+            return $this->validateRequiredAttributeValue($attrCode, $rowData);
         }
         return true;
     }
 
+    /**
+     * Validate required attribute value for both array and string types.
+     *
+     * @param string $attrCode
+     * @param array $rowData
+     * @return bool
+     */
+    private function validateRequiredAttributeValue(string $attrCode, array $rowData): bool
+    {
+        $emptyConstant = $this->context->getEmptyAttributeValueConstant();
+        if (isset($rowData[$attrCode]) && is_array($rowData[$attrCode])) {
+            $trimmedValues = array_map('trim', $rowData[$attrCode]);
+            $filteredArray = array_filter($trimmedValues, function ($value) {
+                return !empty($value);
+            });
+            return !empty($filteredArray)
+                && !in_array($emptyConstant, $trimmedValues, true);
+        }
+        return isset($rowData[$attrCode])
+            && strlen(trim($rowData[$attrCode]))
+            && trim($rowData[$attrCode]) !== $emptyConstant;
+    }
+
     /**
      * Is attribute valid
      *

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php

@@ -56,7 +56,13 @@ protected function setUp(): void
         $entityTypeModel->expects($this->any())->method('retrieveAttributeFromCache')->willReturn([]);
         $this->context = $this->createPartialMock(
             Product::class,
-            ['retrieveProductTypeByName', 'retrieveMessageTemplate', 'getBehavior', 'getMultipleValueSeparator']
+            [
+                'retrieveProductTypeByName',
+                'retrieveMessageTemplate',
+                'getBehavior',
+                'getMultipleValueSeparator',
+                'getEmptyAttributeValueConstant'
+            ]
         );
         $this->context->expects($this->any())->method('retrieveProductTypeByName')->willReturn($entityTypeModel);
         $this->context->expects($this->any())->method('retrieveMessageTemplate')->willReturn('error message');
@@ -281,4 +287,38 @@ public function testInit()
         $this->validatorTwo->expects($this->once())->method('init');
         $this->validator->init(null);
     }
+
+    /**
+     * Test required multi-select attribute validation with array values.
+     *
+     * @return void
+     */
+    public function testIsRequiredAttributeValidWithMultiSelectArray()
+    {
+        $this->context->expects($this->any())->method('getBehavior')->willReturn(Import::BEHAVIOR_APPEND);
+        $this->context->expects($this->any())->method('getEmptyAttributeValueConstant')->willReturn('__EMPTY__');
+        $attrCode = 'required_multiselect_attribute';
+        $attributeParams = ['is_required' => true];
+        $rowData = [
+            'product_type' => 'simple',
+            'required_multiselect_attribute' => ['option1', 'option2']
+        ];
+        $result = $this->validator->isRequiredAttributeValid($attrCode, $attributeParams, $rowData);
+        $this->assertTrue($result);
+        $rowData['required_multiselect_attribute'] = [];
+        $result = $this->validator->isRequiredAttributeValid($attrCode, $attributeParams, $rowData);
+        $this->assertFalse($result);
+        $rowData['required_multiselect_attribute'] = ['option1', '', 'option2'];
+        $result = $this->validator->isRequiredAttributeValid($attrCode, $attributeParams, $rowData);
+        $this->assertTrue($result);
+        $rowData['required_multiselect_attribute'] = ['option1', '   ', 'option2'];
+        $result = $this->validator->isRequiredAttributeValid($attrCode, $attributeParams, $rowData);
+        $this->assertTrue($result);
+        $rowData['required_multiselect_attribute'] = ['option1', '__EMPTY__', 'option2'];
+        $result = $this->validator->isRequiredAttributeValid($attrCode, $attributeParams, $rowData);
+        $this->assertFalse($result);
+        unset($rowData['required_multiselect_attribute']);
+        $result = $this->validator->isRequiredAttributeValid($attrCode, $attributeParams, $rowData);
+        $this->assertFalse($result);
+    }
 }