Fix additional calls to count() on null values

Author: Ben Batschelet

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -177,7 +177,7 @@ protected function _addSubMenu($child, $childLevel, $childrenWrapClass, $limit)
             return $html;
         }
 
-        $colStops = null;
+        $colStops = [];
         if ($childLevel == 0 && $limit) {
             $colStops = $this->_columnBrake($child->getChildren(), $limit);
         }
@@ -205,7 +205,7 @@ protected function _getHtml(
         \Magento\Framework\Data\Tree\Node $menuTree,
         $childrenWrapClass,
         $limit,
-        $colBrakes = []
+        array $colBrakes = []
     ) {
         $html = '';
 

setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php

@@ -722,6 +722,8 @@ private function getSearchTerms()
         if ($searchTerms !== null) {
             $searchTerms = array_key_exists(0, $searchTerms['search_term'])
                 ? $searchTerms['search_term'] : [$searchTerms['search_term']];
+        } else {
+            $searchTerms = [];
         }
         return $searchTerms;
     }
@@ -845,7 +847,7 @@ private function getDescriptionClosure(
             $minAmountOfWordsDescription,
             $descriptionPrefix
         ) {
-            $count = $searchTerms === null
+            $count = !$searchTerms
                 ? 0
                 : round(
                     $searchTerms[$index % count($searchTerms)]['count'] * (

setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php

@@ -170,7 +170,10 @@ public function generate($products, $fixtureMap)
                 ],
             ],
         ];
-        if (count($fixtureMap['website_ids'](1, 0)) === 1) {
+        if (
+            !is_array($fixtureMap['website_ids'](1, 0)) ||
+            count($fixtureMap['website_ids'](1, 0)) === 1
+        ) {
             // Get website id from fixture in case when one site is assigned per product
             $customTableMap['catalog_product_website'] = [
                 'fields' => [