MAGETWO-89091: CE edition - Update composer dependencies

Joan He · Joan He · commit e1bea8819861 · 2018-03-14T15:07:25.000-05:00
- fix count() issue
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2013,7 +2013,7 @@ public function insertArray($table, array $columns, array $data, $strategy = 0)
         $bind         = [];
         $columnsCount = count($columns);
         foreach ($data as $row) {
-            if ($columnsCount != count($row)) {
+            if (is_array($row) && $columnsCount != count($row)) {
                 throw new \Zend_Db_Exception('Invalid data for insert');
             }
             $values[] = $this->_prepareInsertData($row, $bind);

Original file line number	Diff line number	Diff line change
`@@ -2013,7 +2013,7 @@ public function insertArray($table, array $columns, array $data, $strategy = 0)`
`2013`	`2013`	`$bind = [];`
`2014`	`2014`	`$columnsCount = count($columns);`
`2015`	`2015`	`foreach ($data as $row) {`
`2016`		`- if ($columnsCount != count($row)) {`
	`2016`	`+ if (is_array($row) && $columnsCount != count($row)) {`
`2017`	`2017`	`throw new \Zend_Db_Exception('Invalid data for insert');`
`2018`	`2018`	`}`
`2019`	`2019`	`$values[] = $this->_prepareInsertData($row, $bind);`