MAGETWO-83672: [Backport 2.2] MAGETWO-71697: Fix possible bug when sa…

…ving address with empty street line #10582 #12130
magento · Nov 13, 2017 · 24ce033 · 24ce033
2 parents b55f200 + 15df4ab
commit 24ce033
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -269,7 +269,7 @@ public function setData($key, $value = null)
  {
  if (is_array($key)) {
  $key = $this->_implodeArrayField($key);
- } elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
+ } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
  $value = $this->_implodeArrayValues($value);
  }
  return parent::setData($key, $value);
@@ -309,7 +309,11 @@ protected function _implodeArrayField(array $data)
  */
  protected function _implodeArrayValues($value)
  {
- if (is_array($value) && count($value)) {
+ if (is_array($value)) {
+ if (!count($value)) {
+ return '';
+ }
+
  $isScalar = false;
  foreach ($value as $val) {
  if (is_scalar($val)) {

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
@@ -366,6 +366,15 @@ public function testGetStreetFullAlwaysReturnsString($expectedResult, $street)
  $this->assertEquals($expectedResult, $this->model->getStreetFull());
  }
 
+ /**
+ * @dataProvider getStreetFullDataProvider
+ */
+ public function testSetDataStreetAlwaysConvertedToString($expectedResult, $street)
+ {
+ $this->model->setData('street', $street);
+ $this->assertEquals($expectedResult, $this->model->getData('street'));
+ }
+
  /**
  * @return array
  */

diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
@@ -34,6 +34,7 @@
  * Test class for sales quote address model
  *
  * @see \Magento\Quote\Model\Quote\Address
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddressTest extends \PHPUnit\Framework\TestCase
@@ -48,6 +49,11 @@ class AddressTest extends \PHPUnit\Framework\TestCase
  */
  private $quote;
 
+ /**
+ * @var \Magento\Quote\Model\Quote\Address\CustomAttributeListInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $attributeList;
+
  /**
  * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
  */
@@ -166,9 +172,13 @@ protected function setUp()
  ->disableOriginalConstructor()
  ->getMock();
 
+ $this->attributeList = $this->createMock(\Magento\Quote\Model\Quote\Address\CustomAttributeListInterface::class);
+ $this->attributeList->method('getAttributes')->willReturn([]);
+
  $this->address = $objectManager->getObject(
  \Magento\Quote\Model\Quote\Address::class,
  [
+ 'attributeList' => $this->attributeList,
  'scopeConfig' => $this->scopeConfig,
  'serializer' => $this->serializer,
  'storeManager' => $this->storeManager,