merge magento/develop into magento-honey-badgers/declarative_schema_test

magento · Nov 1, 2017 · 0a53cbf · 0a53cbf
2 parents f4bed38 + 2a5c140
commit 0a53cbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/internal/Magento/Framework/Api/FilterBuilder.php b/lib/internal/Magento/Framework/Api/FilterBuilder.php
@@ -29,7 +29,7 @@ public function setField($field)
     /**
      * Set value
      *
-     * @param string $value
+     * @param string|array $value
      * @return $this
      */
     public function setValue($value)

diff --git a/lib/internal/Magento/Framework/Convert/Excel.php b/lib/internal/Magento/Framework/Convert/Excel.php
@@ -147,6 +147,7 @@ protected function _getXmlRow($row, $useCallback)
             }
             if (isset($value[0]) && in_array($value[0], ['=', '+', '-'])) {
                 $value = ' ' . $value;
+                $dataType = 'String';
             }
 
             $value = str_replace("\r\n", '&#10;', $value);