From 02a01dc783c5c5e5ad8199ebe9a316fa0b9419e4 Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <oshmyheliuk@magento.com>
Date: Fri, 7 Oct 2016 17:52:35 +0300
Subject: [PATCH] MAGETWO-58976: [Magento Cloud] - Import issue with a
 multiselect option having special symbols (, and |)

---
 app/code/Magento/CatalogImportExport/Model/Export/Product.php   | 2 ++
 app/code/Magento/CatalogImportExport/Model/Import/Product.php   | 2 ++
 .../CatalogImportExport/Model/Import/Product/Validator.php      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index db1514f0f05..c9d155177e4 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -995,6 +995,8 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     }
 
     /**
+     * Wrap values with double quotes if "Fields Enclosure" option is enabled
+     *
      * @param string|array $value
      * @return string|array
      */
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 73e7939b681..afb2e86b624 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2532,6 +2532,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     }
 
     /**
+     * Parse values of multiselect attributes depends on "Fields Enclosure" parameter
+     *
      * @param string $values
      * @return array
      */
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index f761a016b77..0ca40e916c8 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -72,6 +72,8 @@ class Validator extends AbstractValidator implements RowValidatorInterface
     }
 
     /**
+     * Check if value is valid attribute option
+     *
      * @param string $attrCode
      * @param array $possibleOptions
      * @param string $value
-- 
GitLab