MAGETWO-47376: Number of address lines (street lines) in admin #2450

Author: Sergey Semenov

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -343,41 +343,6 @@
                 </item>
             </argument>
         </field>
-        <container name="street_container">
-            <argument name="data" xsi:type="array">
-                <item name="type" xsi:type="string">group</item>
-                <item name="config" xsi:type="array">
-                    <item name="component" xsi:type="string">Magento_Ui/js/form/components/group</item>
-                    <item name="label" xsi:type="string" translate="true">Street Address</item>
-                    <item name="required" xsi:type="boolean">true</item>
-                    <item name="dataScope" xsi:type="string">street</item>
-                    <item name="sortOrder" xsi:type="string">45</item>
-                </item>
-            </argument>
-            <field name="street">
-                <argument name="data" xsi:type="array">
-                    <item name="config" xsi:type="array">
-                        <item name="dataScope" xsi:type="string">0</item>
-                        <item name="dataType" xsi:type="string">text</item>
-                        <item name="formElement" xsi:type="string">input</item>
-                        <item name="source" xsi:type="string">address</item>
-                        <item name="validation" xsi:type="array">
-                            <item name="required-entry" xsi:type="boolean">true</item>
-                        </item>
-                    </item>
-                </argument>
-            </field>
-            <field name="street_second">
-                <argument name="data" xsi:type="array">
-                    <item name="config" xsi:type="array">
-                        <item name="dataScope" xsi:type="string">1</item>
-                        <item name="dataType" xsi:type="string">text</item>
-                        <item name="formElement" xsi:type="string">input</item>
-                        <item name="source" xsi:type="string">address</item>
-                    </item>
-                </argument>
-            </field>
-        </container>
         <field name="city">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">

lib/internal/Magento/Framework/Data/Form/Element/Multiline.php

@@ -149,4 +149,20 @@ public function getDefaultHtml()
         }
         return $html;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getEscapedValue($index = null)
+    {
+        $value = $this->getValue();
+        if (is_string($value)) {
+            $value = explode("\n", $value);
+            if (is_array($value)) {
+                $this->setValue($value);
+            }
+        }
+
+        return parent::getEscapedValue($index);
+    }
 }

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Data\Test\Unit\Form\Element;
+
+class MultilineTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\Data\Form\Element\Multiline
+     */
+    protected $element;
+
+    /**
+     * @var \Magento\Framework\Data\Form\Element\Factory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $elementFactory;
+
+    /**
+     * @var \Magento\Framework\Data\Form\Element\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactory;
+
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $escaper;
+
+    protected function setUp()
+    {
+        $this->elementFactory = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Factory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->collectionFactory = $this->getMockBuilder('Magento\Framework\Data\Form\Element\CollectionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->escaper = $this->getMockBuilder('Magento\Framework\Escaper')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->element = new \Magento\Framework\Data\Form\Element\Multiline(
+            $this->elementFactory,
+            $this->collectionFactory,
+            $this->escaper
+        );
+    }
+
+    /**
+     * @param mixed $value
+     * @param int $index
+     * @param string $resultValue
+     * @return void
+     * @dataProvider dataProviderValues
+     */
+    public function testGetEscapedValue($value, $index, $resultValue)
+    {
+        $this->element->setValue($value);
+
+        $result = $this->element->getEscapedValue($index);
+        $this->assertEquals($resultValue, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderValues()
+    {
+        return [
+            ["", 0, ""],
+            ["string1", 0, "string1"],
+            ["string1\nstring2", 0, "string1"],
+            ["string1\nstring2", 1, "string2"],
+            ["string1\nstring2", 2, null],
+            [null, 0, null],
+        ];
+    }
+}