MAGETWO-61025: Product export duplicate rows for product with html special chars in data

Author: adifucan

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -961,7 +961,7 @@ protected function collectRawData()
 
                     if ($storeId != Store::DEFAULT_STORE_ID
                         && isset($data[$itemId][Store::DEFAULT_STORE_ID][$fieldName])
-                        && $data[$itemId][Store::DEFAULT_STORE_ID][$fieldName] == $attrValue
+                        && $data[$itemId][Store::DEFAULT_STORE_ID][$fieldName] == htmlspecialchars_decode($attrValue)
                     ) {
                         continue;
                     }
@@ -1000,7 +1000,7 @@ protected function collectRawData()
                     $data[$itemId][$storeId][self::COL_ATTR_SET] = $this->_attrSetIdToName[$attrSetId];
                     $data[$itemId][$storeId][self::COL_TYPE] = $item->getTypeId();
                 }
-                $data[$itemId][$storeId][self::COL_SKU] = $item->getSku();
+                $data[$itemId][$storeId][self::COL_SKU] = htmlspecialchars_decode($item->getSku());
                 $data[$itemId][$storeId]['store_id'] = $storeId;
                 $data[$itemId][$storeId]['product_id'] = $itemId;
                 $data[$itemId][$storeId]['product_link_id'] = $productLinkId;

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php

@@ -39,6 +39,8 @@
     'simple_ms_1'
 )->setPrice(
     10
+)->setDescription(
+    'Hello " &" Bring the water bottle when you can!'
 )->setVisibility(
     \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
 )->setMultiselectAttribute(

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php

@@ -56,6 +56,7 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit_Framework_Te
         'custom_design_from',
         'updated_in',
         'tax_class_id',
+        'description'
     ];
 
     protected function setUp()

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

@@ -87,6 +87,23 @@ public function testExport()
         $this->assertContains('test_option_code_2', $exportData);
         $this->assertContains('max_characters=10', $exportData);
         $this->assertContains('text_attribute=!@#$%^&*()_+1234567890-=|\\:;""\'<,>.?/', $exportData);
+        $occurrencesCount = substr_count($exportData, 'Hello "" &"" Bring the water bottle when you can!');
+        $this->assertEquals(1, $occurrencesCount);
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data_special_chars.php
+     * @magentoDbIsolationEnabled
+     */
+    public function testExportSpecialChars()
+    {
+        $this->model->setWriter(
+            $this->objectManager->create(
+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
+            )
+        );
+        $exportData = $this->model->export();
+        $this->assertContains('simple ""1""', $exportData);
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** Create category */
+require dirname(dirname(__DIR__)) . '/Catalog/_files/category.php';
+/** Create fixture store */
+require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
+/** Create product with multiselect attribute and values */
+require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute.php';
+/** Create dummy text attribute */
+require dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Model\Product $productModel */
+$productModel = $objectManager->create(\Magento\Catalog\Model\Product::class);
+
+$productModel->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setName('New Product')
+    ->setSku('simple &quot;1&quot;')
+    ->setPrice(10)
+    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'])
+    ->setTierPrice([0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]])
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCateroryIds([])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setCanSaveCustomOptions(true)
+    ->setCategoryIds([333])
+    ->setUpSellLinkData([$product->getId() => ['position' => 1]]);
+
+$productModel->setOptions([])->save();

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** Delete all products */
+require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
+/** Delete text attribute */
+require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';