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

Magento CICD · web-flow · commit 0a53cbfa4c0f · 2017-11-01T02:20:32.000-07:00
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);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function setField($field)`
`29`	`29`	`/**`
`30`	`30`	`* Set value`
`31`	`31`	`*`
`32`		`- * @param string $value`
	`32`	`+ * @param string\|array $value`
`33`	`33`	`* @return $this`
`34`	`34`	`*/`
`35`	`35`	`public function setValue($value)`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ protected function _getXmlRow($row, $useCallback)`
`147`	`147`	`}`
`148`	`148`	`if (isset($value[0]) && in_array($value[0], ['=', '+', '-'])) {`
`149`	`149`	`$value = ' ' . $value;`
	`150`	`+ $dataType = 'String';`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`$value = str_replace("\r\n", ' ', $value);`