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

Oleksandr Gorkun · Oleksandr Gorkun · commit 4d338c7df9e2 · 2019-08-22T10:57:21.000-05:00
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
@@ -825,8 +825,10 @@ protected function _getAllItems()
                 $fullItems[] = array_fill(0, $qty, $this->_getWeight($itemWeight));
             }
         }
-        $fullItems = array_merge(...$fullItems);
-        sort($fullItems);
+        if ($fullItems) {
+            $fullItems = array_merge(...$fullItems);
+            sort($fullItems);
+        }
 
         return $fullItems;
     }

Original file line number	Diff line number	Diff line change
`@@ -825,8 +825,10 @@ protected function _getAllItems()`
`825`	`825`	`$fullItems[] = array_fill(0, $qty, $this->_getWeight($itemWeight));`
`826`	`826`	`}`
`827`	`827`	`}`
`828`		`- $fullItems = array_merge(...$fullItems);`
`829`		`- sort($fullItems);`
	`828`	`+ if ($fullItems) {`
	`829`	`+ $fullItems = array_merge(...$fullItems);`
	`830`	`+ sort($fullItems);`
	`831`	`+ }`
`830`	`832`
`831`	`833`	`return $fullItems;`
`832`	`834`	`}`