Merge branch 'ACP2E-2684' of https://github.com/magento-l3/magento2ce into PR-12-19-2023

Author: chittima

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -314,9 +314,9 @@ public function setData($key, $value = null)
         } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
             $value = $this->_implodeArrayValues($value);
         } elseif (self::CUSTOM_ATTRIBUTES === $key && is_array($value)) {
-            foreach ($value as &$attribute) {
-                $attribute = is_array($attribute) ? $attribute : $attribute->__toArray();
-                $attribute = $this->processCustomAttribute($attribute);
+            $value = $this->filterCustomAttributes([self::CUSTOM_ATTRIBUTES => $value])[self::CUSTOM_ATTRIBUTES];
+            foreach ($value as $attribute) {
+                $this->processCustomAttribute($attribute);
             }
         }
 
@@ -748,22 +748,16 @@ protected function isFaxRequired()
     }
 
     /**
-     * Unify attribute format.
+     * Normalize custom attribute value
      *
-     * @param array $attribute
-     * @return array
+     * @param \Magento\Framework\Api\AttributeInterface $attribute
+     * @return void
      */
-    private function processCustomAttribute(array $attribute): array
+    private function processCustomAttribute(\Magento\Framework\Api\AttributeInterface $attribute): void
     {
-        if (isset($attribute['attribute_code']) &&
-            isset($attribute['value']) &&
-            is_array($attribute['value']) &&
-            $this->isAddressMultilineAttribute($attribute['attribute_code'])
-        ) {
-            $attribute['value'] = $this->_implodeArrayValues($attribute['value']);
+        if (is_array($attribute->getValue()) && $this->isAddressMultilineAttribute($attribute->getAttributeCode())) {
+            $attribute->setValue($this->_implodeArrayValues($attribute->getValue()));
         }
-
-        return $attribute;
     }
 
     /**

app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php

@@ -17,6 +17,8 @@
 use Magento\Directory\Model\RegionFactory;
 use Magento\Directory\Model\ResourceModel\Region\Collection;
 use Magento\Eav\Model\Config;
+use Magento\Framework\Api\AttributeInterface;
+use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\DataObject;
 use Magento\Framework\Model\Context;
@@ -438,6 +440,57 @@ public function getStreetFullDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
+    public function testSetCustomerAttributes(): void
+    {
+        $model = $this->getMockBuilder(AbstractAddress::class)
+            ->onlyMethods(['getCustomAttributesCodes'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $customAttributeFactory = $this->createMock(\Magento\Customer\Model\AttributeFactory::class);
+        $customAttributeFactory->method('create')
+            ->willReturnCallback(
+                function ($data) {
+                    return new AttributeValue($data);
+                }
+            );
+        $data = [
+            'customer_attribute1' => new AttributeValue([
+                'attribute_code' => 'customer_attribute1',
+                'value' => 'customer_attribute1_value'
+            ]),
+            'customer_attribute2' => new AttributeValue([
+                'attribute_code' => 'customer_attribute2',
+                'value' => ['customer_attribute2_value1', 'customer_attribute2_value2']
+            ])
+        ];
+        $model->method('getCustomAttributesCodes')->willReturn(array_keys($data));
+        $this->objectManager->setBackwardCompatibleProperty(
+            $model,
+            'customAttributeFactory',
+            $customAttributeFactory
+        );
+        $model->setData('custom_attributes', $data);
+        $this->assertEquals(
+            [
+                [
+                    'attribute_code' => 'customer_attribute1',
+                    'value' => 'customer_attribute1_value'
+                ],
+                [
+                    'attribute_code' => 'customer_attribute2',
+                    'value' => "customer_attribute2_value1\ncustomer_attribute2_value2"
+                ]
+            ],
+            array_map(
+                fn ($attr) => ['attribute_code' => $attr->getAttributeCode(), 'value' => $attr->getValue()],
+                $model->getCustomAttributes()
+            )
+        );
+    }
+
     protected function tearDown(): void
     {
         $this->objectManager->setBackwardCompatibleProperty(