Merge branch 'MAGETWO-70618' of github.com:magento-folks/magento2ce into 2.2-bugs

Author: omiroshnichenko

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

@@ -230,7 +230,8 @@ public function getStreetLine($number)
      */
     public function getStreetFull()
     {
-        return $this->getData('street');
+        $street = $this->getData('street');
+        return is_array($street) ? implode("\n", $street) : $street;
     }
 
     /**

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

@@ -377,4 +377,27 @@ public function validateDataProvider()
             'validated' => [array_merge($data, ['country_id' => $countryId++]), true],
         ];
     }
+
+    /**
+     * @dataProvider getStreetFullDataProvider
+     */
+    public function testGetStreetFullAlwaysReturnsString($expectedResult, $street)
+    {
+        $this->model->setData('street', $street);
+        $this->assertEquals($expectedResult, $this->model->getStreetFull());
+    }
+
+    /**
+     * @return array
+     */
+    public function getStreetFullDataProvider()
+    {
+        return [
+            [null, null],
+            ['', []],
+            ["first line\nsecond line", ['first line', 'second line']],
+            ['single line', ['single line']],
+            ['single line', 'single line'],
+        ];
+    }
 }