Merge remote-tracking branch 'origin/MAGETWO-99710' into 2.2-develop-pr32

Author: serhii-balko

app/code/Magento/Customer/Model/Customer/DataProvider.php

@@ -27,6 +27,7 @@
 use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
+use Magento\Ui\Component\Form\Element\Multiline;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -568,8 +569,14 @@ protected function prepareAddressData($addressId, array &$addresses, array $cust
         ) {
             $addresses[$addressId]['default_shipping'] = $customer['default_shipping'];
         }
-        if (isset($addresses[$addressId]['street']) && !is_array($addresses[$addressId]['street'])) {
-            $addresses[$addressId]['street'] = explode("\n", $addresses[$addressId]['street']);
+
+        foreach ($this->meta['address']['children'] as $attributeName => $attributeMeta) {
+            if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
+                && isset($addresses[$addressId][$attributeName])
+                && !\is_array($addresses[$addressId][$attributeName])
+            ) {
+                $addresses[$addressId][$attributeName] = explode("\n", $addresses[$addressId][$attributeName]);
+            }
         }
     }
 

app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php

@@ -249,7 +249,25 @@ public function getAttributesMetaDataProvider()
                                         ],
                                     ],
                                 ],
-                            ]
+                            ],
+                            'street' => [
+                                'arguments' => [
+                                    'data' => [
+                                        'config' => [
+                                            'dataType' => 'multiline',
+                                            'formElement' => 'multiline',
+                                            'visible' => true,
+                                            'required' => '1',
+                                            'label' => __('Multiline address'),
+                                            'sortOrder' => '70',
+                                            'notice' => 'note',
+                                            'default' => 'Default',
+                                            'size' => '2',
+                                            'componentType' => Field::NAME,
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                 ]
@@ -477,6 +495,7 @@ protected function getAttributeMock($type = 'customer', $options = [])
         $this->injectVisibilityProps($attributeMock, $attributeBooleanMock, $options);
         if ($type == "address") {
             $mocks[] = $this->getCountryAttrMock();
+            $mocks[] = $this->getStreetAttrMock();
         }
         return $mocks;
     }
@@ -544,6 +563,54 @@ function ($origName) {
         return $countryAttrMock;
     }
 
+    /**
+     * @return AbstractAttribute|\PHPUnit_Framework_MockObject_MockObjec
+     */
+    private function getStreetAttrMock()
+    {
+        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataUsingMethod',
+                    'usesSource',
+                    'getFrontendInput',
+                    'getIsVisible',
+                    'getSource',
+                    'getIsUserDefined',
+                    'getUsedInForms',
+                    'getEntityType',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $map = [
+            ['frontend_input', null, 'multiline'],
+            ['is_required', null, '1'],
+            ['frontend_label', null, __('Multiline address')],
+            ['note', null, 'note'],
+            ['sort_order', null, '70'],
+            ['note', null, null],
+            ['default_value', null, 'Default'],
+            ['multiline_count', null, 2],
+        ];
+
+        $attributeMock->method('getDataUsingMethod')
+            ->will($this->returnValueMap($map));
+
+        $attributeMock->method('getAttributeCode')
+            ->willReturn('street');
+
+        $attributeMock->method('usesSource')
+            ->willReturn(false);
+
+        $attributeMock->method('getIsVisible')
+            ->willReturn(true);
+
+        return $attributeMock;
+    }
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -1470,7 +1537,25 @@ private function getExpectationForVisibleAttributes()
                                 ],
                             ],
                         ],
-                    ]
+                    ],
+                    'street' => [
+                        'arguments' => [
+                            'data' => [
+                                'config' => [
+                                    'dataType' => 'multiline',
+                                    'formElement' => 'multiline',
+                                    'visible' => true,
+                                    'required' => '1',
+                                    'label' => __('Multiline address'),
+                                    'sortOrder' => '70',
+                                    'notice' => 'note',
+                                    'default' => 'Default',
+                                    'size' => '2',
+                                    'componentType' => Field::NAME,
+                                ],
+                            ],
+                        ],
+                    ],
                 ],
             ],
         ];