Merge remote-tracking branch 'origin/MC-22822' into 2.3-develop-pr89

zakdma · zakdma · commit e2c06e7b1acd · 2019-11-07T22:41:28.000+02:00
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -133,15 +133,15 @@ protected function _countItems($items)
      *
      * @param Menu $items
      * @param int $limit
-     * @return array
+     * @return array|void
      *
      * @todo: Add Depth Level limit, and better logic for columns
      */
     protected function _columnBrake($items, $limit)
     {
         $total = $this->_countItems($items);
         if ($total <= $limit) {
-            return [];
+            return;
         }
 
         $result[] = ['total' => $total, 'max' => (int)ceil($total / ceil($total / $limit))];

Original file line number	Diff line number	Diff line change
`@@ -133,15 +133,15 @@ protected function _countItems($items)`
`133`	`133`	`*`
`134`	`134`	`* @param Menu $items`
`135`	`135`	`* @param int $limit`
`136`		`- * @return array`
	`136`	`+ * @return array\|void`
`137`	`137`	`*`
`138`	`138`	`* @todo: Add Depth Level limit, and better logic for columns`
`139`	`139`	`*/`
`140`	`140`	`protected function _columnBrake($items, $limit)`
`141`	`141`	`{`
`142`	`142`	`$total = $this->_countItems($items);`
`143`	`143`	`if ($total <= $limit) {`
`144`		`- return [];`
	`144`	`+ return;`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`$result[] = ['total' => $total, 'max' => (int)ceil($total / ceil($total / $limit))];`