Merge remote-tracking branch 'origin/MAGETWO-98341' into borg-qwerty-2.1

nathanjosiah · nathanjosiah · commit e3ba8e705579 · 2019-04-19T13:58:59.000-05:00
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
@@ -774,7 +774,7 @@ protected function _getAllItems()
      * @param float $itemWeight
      * @param float $maxWeight
      */
-    private function pushDecimalItems(array &$decimalItems, float $itemWeight, float $maxWeight): void
+    private function pushDecimalItems(array &$decimalItems, float $itemWeight, float $maxWeight)
     {
         $qtyItem = floor($itemWeight / $maxWeight);
         $decimalItems[] = ['weight' => $maxWeight, 'qty' => $qtyItem];

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ protected function _getAllItems()`
`774`	`774`	`* @param float $itemWeight`
`775`	`775`	`* @param float $maxWeight`
`776`	`776`	`*/`
`777`		`- private function pushDecimalItems(array &$decimalItems, float $itemWeight, float $maxWeight): void`
	`777`	`+ private function pushDecimalItems(array &$decimalItems, float $itemWeight, float $maxWeight)`
`778`	`778`	`{`
`779`	`779`	`$qtyItem = floor($itemWeight / $maxWeight);`
`780`	`780`	`$decimalItems[] = ['weight' => $maxWeight, 'qty' => $qtyItem];`