MC-19145: [CLOUD] Internal error after DHL was configured

Oleksandr Gorkun · Oleksandr Gorkun · commit 059b5cc7d1d0 · 2019-08-16T12:08:39.000-05:00
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
@@ -819,15 +819,13 @@ protected function _getAllItems()
 
             if (!empty($decimalItems)) {
                 foreach ($decimalItems as $decimalItem) {
-                    $fullItems = array_merge(
-                        $fullItems,
-                        array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight'])
-                    );
+                    $fullItems[] = array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight']);
                 }
             } else {
-                $fullItems = array_merge($fullItems, array_fill(0, $qty, $this->_getWeight($itemWeight)));
+                $fullItems[] = array_fill(0, $qty, $this->_getWeight($itemWeight));
             }
         }
+        $fullItems = array_merge(...$fullItems);
         sort($fullItems);
 
         return $fullItems;

Original file line number	Diff line number	Diff line change
`@@ -819,15 +819,13 @@ protected function _getAllItems()`
`819`	`819`
`820`	`820`	`if (!empty($decimalItems)) {`
`821`	`821`	`foreach ($decimalItems as $decimalItem) {`
`822`		`- $fullItems = array_merge(`
`823`		`- $fullItems,`
`824`		`- array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight'])`
`825`		`- );`
	`822`	`+ $fullItems[] = array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight']);`
`826`	`823`	`}`
`827`	`824`	`} else {`
`828`		`- $fullItems = array_merge($fullItems, array_fill(0, $qty, $this->_getWeight($itemWeight)));`
	`825`	`+ $fullItems[] = array_fill(0, $qty, $this->_getWeight($itemWeight));`
`829`	`826`	`}`
`830`	`827`	`}`
	`828`	`+ $fullItems = array_merge(...$fullItems);`
`831`	`829`	`sort($fullItems);`
`832`	`830`
`833`	`831`	`return $fullItems;`