Merge branch 'MAGETWO-59413' into backports-2.0.11

magento · Oct 27, 2016 · c6595d1 · c6595d1
2 parents fbdb307 + 4f82185
commit c6595d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -483,7 +483,11 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
                     $resultAttrs[$attrCode] = $attrParams['options'][strtolower($rowData[$attrCode])];
                 } elseif ('multiselect' == $attrParams['type']) {
                     $resultAttrs[$attrCode] = [];
-                    foreach ($this->parseMultiselectValues($this->_entityModel, $rowData[$attrCode]) as $value) {
+                    $multiSelectValues = $this->parseMultiSelectValues(
+                        $this->_entityModel->getParameters(),
+                        $rowData[$attrCode]
+                    );
+                    foreach ($multiSelectValues as $value) {
                         $resultAttrs[$attrCode][] = $attrParams['options'][strtolower($value)];
                     }
                     $resultAttrs[$attrCode] = implode(',', $resultAttrs[$attrCode]);
@@ -529,12 +533,12 @@ public function saveData()
     /**
      * Parse values of multiselect attributes depends on "Fields Enclosure" parameter
      *
+     * @param array $parameters
      * @param string $values
      * @return array
      */
-    private function parseMultiselectValues(\Magento\CatalogImportExport\Model\Import\Product $context, $values)
+    private function parseMultiSelectValues(array $parameters, $values)
     {
-        $parameters = $context->getParameters();
         if (empty($parameters[\Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE])) {
             return explode(\Magento\CatalogImportExport\Model\Import\Product::PSEUDO_MULTI_LINE_SEPARATOR, $values);
         }

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -190,7 +190,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
                 $valid = $this->validateOption($attrCode, $attrParams['options'], $rowData[$attrCode]);
                 break;
             case 'multiselect':
-                $values = $this->parseMultiselectValues($this->context, $rowData[$attrCode]);
+                $values = $this->parseMultiSelectValues($this->context->getParameters(), $rowData[$attrCode]);
                 foreach ($values as $value) {
                     $valid = $this->validateOption($attrCode, $attrParams['options'], $value);
                     if (!$valid) {
@@ -293,12 +293,12 @@ public function init($context)
     /**
      * Parse values of multiselect attributes depends on "Fields Enclosure" parameter
      *
+     * @param array $parameters
      * @param string $values
      * @return array
      */
-    private function parseMultiselectValues(\Magento\CatalogImportExport\Model\Import\Product $context, $values)
+    private function parseMultiSelectValues(array $parameters, $values)
     {
-        $parameters = $context->getParameters();
         if (empty($parameters[\Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE])) {
             return explode(\Magento\CatalogImportExport\Model\Import\Product::PSEUDO_MULTI_LINE_SEPARATOR, $values);
         }