Fix Calls to count()

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>';
@@ -387,7 +387,11 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
             $itemClass = str_replace('_', '-', strtolower($itemName));
 
-            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
+            if (is_array($colBrakes)
+                && count($colBrakes)
+                && $colBrakes[$itemPosition]['colbrake']
+                && $itemPosition != 1
+            ) {
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 
@@ -401,7 +405,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemPosition++;
         }
 
-        if (count($colBrakes) && $limit) {
+        if (is_array($colBrakes) && count($colBrakes) && $limit) {
             $output = '<li class="column"><ul role="menu">' . $output . '</ul></li>';
         }
 

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -19,7 +19,7 @@
  *
  */
 /* @var $block \Magento\Backend\Block\Widget\Grid */
-$numColumns = sizeof($block->getColumns());
+$numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
 ?>
 <?php if ($block->getCollection()): ?>
 

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 = '';
 
@@ -244,7 +244,7 @@ protected function _getHtml(
                 }
             }
 
-            if (count($colBrakes) && $colBrakes[$counter]['colbrake']) {
+            if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$counter]['colbrake']) {
                 $html .= '</ul></li><li class="column"><ul>';
             }
 
@@ -261,7 +261,7 @@ protected function _getHtml(
             $counter++;
         }
 
-        if (count($colBrakes) && $limit) {
+        if (is_array($colBrakes) && count($colBrakes) && $limit) {
             $html = '<li class="column"><ul>' . $html . '</ul></li>';
         }
 

app/code/Magento/Ui/DataProvider/AbstractDataProvider.php

@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  */
-abstract class AbstractDataProvider implements DataProviderInterface
+abstract class AbstractDataProvider implements DataProviderInterface, \Countable
 {
     /**
      * Data Provider name

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php

@@ -9,6 +9,7 @@
  */
 namespace Magento\Test\Bootstrap;
 
+ob_start();
 class EnvironmentTest extends \PHPUnit\Framework\TestCase
 {
     /**

dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php

@@ -13,28 +13,24 @@
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\Session\Config */
-    protected $_model;
+    private $_model;
 
     /** @var string */
-    protected $_cacheLimiter = 'private_no_expire';
+    private $_cacheLimiter = 'private_no_expire';
 
     /** @var \Magento\TestFramework\ObjectManager */
-    protected $_objectManager;
+    private $_objectManager;
 
     /** @var string Default value for session.save_path setting */
-    protected $defaultSavePath;
+    private $defaultSavePath;
 
     /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
-    protected $deploymentConfigMock;
+    private $deploymentConfigMock;
 
     protected function setUp()
     {
         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var $sessionManager \Magento\Framework\Session\SessionManager */
-        $sessionManager = $this->_objectManager->create(\Magento\Framework\Session\SessionManager::class);
-        if ($sessionManager->isSessionExists()) {
-            $sessionManager->writeClose();
-        }
+
         $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
         $this->deploymentConfigMock
             ->method('get')

dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Session\SaveHandler;
 use Magento\Framework\App\ObjectManager;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
@@ -57,13 +56,6 @@ public function testSetSaveHandler($deploymentConfigHandler, $iniHandler)
         );
     }
 
-    public function tearDown()
-    {
-        if (isset($this->originalSaveHandler)) {
-            ini_set('session.save_handler', $this->originalSaveHandler);
-        }
-    }
-
     public function saveHandlerProvider()
     {
         return [

dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php

@@ -114,6 +114,7 @@ protected function tearDown()
         {
             global $mockPHPFunctions;
             $mockPHPFunctions = false;
+            $this->_model->destroy();
         }
 
         public function testSessionNameFromIni()
@@ -149,7 +150,9 @@ public function testGetName()
 
         public function testSetName()
         {
+            $this->_model->destroy();
             $this->_model->setName('test');
+            $this->_model->start();
             $this->assertEquals('test', $this->_model->getName());
         }
 

dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php

@@ -154,10 +154,12 @@ public function testGetSessionIdQueryParam()
 
     public function testGetSessionIdQueryParamCustom()
     {
+        $this->session->destroy();
         $oldSessionName = $this->session->getName();
         $this->session->setName($this->customSessionName);
         $this->assertEquals($this->customSessionQueryParam, $this->model->getSessionIdQueryParam($this->session));
         $this->session->setName($oldSessionName);
+        $this->session->start();
     }
 
     public function testSetGetUseSessionVar()

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 (count($matches) === 2 && count($partPath = $matches[1]) >= 1) {
+            if (count($matches) === 2) {
                 $partPath = $matches[1];
                 return $partPath;
             }

lib/internal/Magento/Framework/DB/Tree/NodeSet.php

@@ -9,7 +9,7 @@
  * TODO implements iterators
  *
  */
-class NodeSet implements \Iterator
+class NodeSet implements \Iterator, \Countable
 {
     /**
      * @var Node[]

lib/internal/Magento/Framework/Data/Form/Element/Collection.php

@@ -13,7 +13,7 @@
  *
  * @author      Magento Core Team <[email protected]>
  */
-class Collection implements \ArrayAccess, \IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     /**
      * Elements storage

lib/internal/Magento/Framework/Data/Tree/Node/Collection.php

@@ -17,7 +17,7 @@
 /**
  * @api
  */
-class Collection implements \ArrayAccess, \IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     /**
      * @var array

lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php

@@ -111,8 +111,10 @@ public function getConstructorExceptionData()
                 $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1);
                 $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1);
                 $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false];
-                $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector];
-                $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector];
+                $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector']
+                    = [$this->_key, $cipher, $mode, $tooShortInitVector];
+                $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector']
+                    = [$this->_key, $cipher, $mode, $tooLongInitVector];
             }
         }
         return $result;

lib/internal/Magento/Framework/File/Uploader.php

@@ -534,7 +534,7 @@ private function _setUploadFileId($fileId)
 
             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
 
-            if (count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
+            if (is_array($file) && count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
                 array_shift($file);
                 $this->_uploadType = self::MULTIPLE_STYLE;
 
@@ -547,7 +547,7 @@ private function _setUploadFileId($fileId)
 
                 $fileAttributes = $tmpVar;
                 $this->_file = $fileAttributes;
-            } elseif (count($fileId) > 0 && isset($_FILES[$fileId])) {
+            } elseif (!empty($fileId) && isset($_FILES[$fileId])) {
                 $this->_uploadType = self::SINGLE_STYLE;
                 $this->_file = $_FILES[$fileId];
             } elseif ($fileId == '') {

lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php

@@ -301,9 +301,12 @@ public function getImageType()
         if ($this->_fileType) {
             return $this->_fileType;
         } else {
-            list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName);
-            return $this->_fileType;
+            if ($this->_canProcess()) {
+                list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName);
+                return $this->_fileType;
+            }
         }
+        return null;
     }
 
     /**

lib/internal/Magento/Framework/Session/SaveHandler.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\SessionException;
 use Magento\Framework\Session\Config\ConfigInterface;
 
 /**
@@ -53,7 +52,7 @@ public function __construct(
 
         try {
             $connection = $saveHandlerFactory->create($saveMethod);
-        } catch (SessionException $e) {
+        } catch (\LogicException $e) {
             $connection = $saveHandlerFactory->create($default);
             $this->setSaveHandler($default);
         }

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,10 +847,11 @@ private function getDescriptionClosure(
             $minAmountOfWordsDescription,
             $descriptionPrefix
         ) {
-            $count = $searchTerms === null
+            $countSearchTerms = is_array($searchTerms) ? count($searchTerms) : 0;
+            $count = !$searchTerms
                 ? 0
                 : round(
-                    $searchTerms[$index % count($searchTerms)]['count'] * (
+                    $searchTerms[$index % $countSearchTerms]['count'] * (
                         $configurableProductsCount / ($simpleProductsCount + $configurableProductsCount)
                     )
                 );
@@ -858,8 +861,8 @@ private function getDescriptionClosure(
                 $maxAmountOfWordsDescription,
                 $descriptionPrefix . '-' . $index
             ) .
-            ($index <= ($count * count($searchTerms)) ? ' ' .
-            $searchTerms[$index % count($searchTerms)]['term'] : '');
+            ($index <= ($count * $countSearchTerms) ? ' ' .
+            $searchTerms[$index % $countSearchTerms]['term'] : '');
         };
     }
 

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

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

setup/src/Magento/Setup/Module/I18n/Pack/Generator.php

@@ -71,7 +71,8 @@ public function generate(
         $locale = $this->factory->createLocale($locale);
         $dictionary = $this->dictionaryLoader->load($dictionaryPath);
 
-        if (!count($dictionary->getPhrases())) {
+        $phrases = $dictionary->getPhrases();
+        if (!is_array($phrases) || !count($phrases)) {
             throw new \UnexpectedValueException('No phrases have been found by the specified path.');
         }
 

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);
     }