Merge remote-tracking branch 'git-35658/fix_implode_multiline_address_with_null_value' into comm_voted_v1

engcom-Echo · engcom-Echo · commit d0b61501a7d3 · 2023-04-04T17:24:06.000+05:30
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -336,7 +336,7 @@ protected function _implodeArrayValues($value)
 
             $isScalar = true;
             foreach ($value as $val) {
-                if (!is_scalar($val)) {
+                if ($val !== null && !is_scalar($val)) {
                     $isScalar = false;
                     break;
                 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
@@ -407,6 +407,7 @@ public function getStreetFullDataProvider()
             ["first line\nsecond line", ['first line', 'second line']],
             ['single line', ['single line']],
             ['single line', 'single line'],
+            ['single line', ['single line', null]],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ protected function _implodeArrayValues($value)`
`336`	`336`
`337`	`337`	`$isScalar = true;`
`338`	`338`	`foreach ($value as $val) {`
`339`		`- if (!is_scalar($val)) {`
	`339`	`+ if ($val !== null && !is_scalar($val)) {`
`340`	`340`	`$isScalar = false;`
`341`	`341`	`break;`
`342`	`342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,7 @@ public function getStreetFullDataProvider()`
`407`	`407`	`["first line\nsecond line", ['first line', 'second line']],`
`408`	`408`	`['single line', ['single line']],`
`409`	`409`	`['single line', 'single line'],`
	`410`	`+ ['single line', ['single line', null]],`
`410`	`411`	`];`
`411`	`412`	`}`
`412`	`413`