Fix incompatible calls to count() in unit and static tests

Author: Ben Batschelet

app/code/Magento/Backend/Block/Menu.php

@@ -352,7 +352,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
             return $output;
         }
         $output .= '<div class="submenu"' . ($level == 0 && isset($id) ? ' aria-labelledby="' . $id . '"' : '') . '>';
-        $colStops = null;
+        $colStops = [];
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
             $output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';

dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php

@@ -233,7 +233,7 @@ private function isItTest($relativeFilePath)
     private function getControllerPath($relativeFilePath)
     {
         if (preg_match('~(Magento\/.*Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
-            if (is_array($matches) && count($matches) === 2 && is_array($matches[1]) && count($matches[1]) >= 1) {
+            if (count($matches) === 2) {
                 $partPath = $matches[1];
                 return $partPath;
             }

setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php

@@ -102,6 +102,9 @@ public function testGenerateEmptyFile()
             ->method('load')
             ->with($dictionaryPath)
             ->will($this->returnValue($this->dictionaryMock));
+        $this->dictionaryMock->expects($this->once())
+            ->method('getPhrases')
+            ->will($this->returnValue([]));
 
         $this->_generator->generate($dictionaryPath, $localeString, $mode, $allowDuplicates);
     }