Merge branch 'ACP2E-1736' of https://github.com/magento-l3/magento2ce into PR-L3-03132023

Author: chittima

app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php

@@ -38,7 +38,7 @@ class AddressTest extends TestCase
     /**
      * Test attribute code
      */
-    const ATTRIBUTE_CODE = 'code1';
+    public const ATTRIBUTE_CODE = 'code1';
 
     /**
      * Websites array (website id => code)
@@ -52,10 +52,16 @@ class AddressTest extends TestCase
      *
      * @var array
      */
-    protected $_attributes = [['attribute_id' => 1, 'attribute_code' => self::ATTRIBUTE_CODE]];
+    protected $_attributes = [
+        [
+            'attribute_id' => 1,
+            'attribute_code' => self::ATTRIBUTE_CODE,
+            'frontend_input' => 'multiselect'
+        ]
+    ];
 
     /**
-     * Customer data
+     * Customer details
      *
      * @var array
      */
@@ -166,8 +172,11 @@ protected function _getModelDependencies()
                 true,
                 true,
                 true,
-                ['_construct']
+                ['_construct', 'getSource']
             );
+
+            $attributeSource = $this->createMock(\Magento\Eav\Model\Entity\Attribute\Source\AbstractSource::class);
+            $attribute->expects($this->once())->method('getSource')->willReturn($attributeSource);
             $attributeCollection->addItem($attribute);
         }
 

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

@@ -286,7 +286,8 @@ protected function _addAttributeValuesToRow(\Magento\Framework\Model\AbstractMod
 
             if ($this->isMultiselect($attributeCode)) {
                 $values = [];
-                $attributeValue = explode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $attributeValue);
+                $attributeValue =
+                    $attributeValue ? explode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $attributeValue) : [];
                 foreach ($attributeValue as $value) {
                     $values[] = $this->getAttributeValueById($attributeCode, $value);
                 }