MAGETWO-66066: Remove usages of unserialize in module Magento/ImportExport

- Remove serialize
- Added tests

Author: Oleksandr Dubovyk

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

@@ -8,6 +8,8 @@
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Import entity abstract model
@@ -271,6 +273,13 @@ abstract class AbstractEntity
      */
     protected $countItemsDeleted = 0;
 
+    /**
+     * Json Serializer Instance
+     *
+     * @var Json
+     */
+    private $json;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -279,6 +288,7 @@ abstract class AbstractEntity
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @param array $data
+     * @param Json|null $json
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(
@@ -288,9 +298,11 @@ public function __construct(
         \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
         ResourceConnection $resource,
         ProcessingErrorAggregatorInterface $errorAggregator,
-        array $data = []
+        array $data = [],
+        Json $json = null
     ) {
         $this->_scopeConfig = $scopeConfig;
+        $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
         $this->_dataSourceModel = isset(
             $data['data_source_model']
         ) ? $data['data_source_model'] : $importFactory->create()->getDataSourceModel();
@@ -447,7 +459,7 @@ protected function _saveValidatedBunches()
                         foreach ($entityGroup as $key => $value) {
                             $bunchRows[$key] = $value;
                         }
-                        $productDataSize = strlen(serialize($bunchRows));
+                        $productDataSize = strlen($this->json->serialize($bunchRows));
 
                         /* Check if the new bunch should be started */
                         $isBunchSizeExceeded = ($this->_bunchSize > 0 && count($bunchRows) >= $this->_bunchSize);

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php

@@ -10,6 +10,8 @@
 use Magento\ImportExport\Model\Import as ImportExport;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Import entity abstract model
@@ -246,6 +248,13 @@ abstract class AbstractEntity
      */
     protected $metadataPool;
 
+    /**
+     * Json Serializer Instance
+     *
+     * @var Json
+     */
+    private $json;
+
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -255,6 +264,7 @@ abstract class AbstractEntity
      * @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param ProcessingErrorAggregatorInterface $errorAggregator
+     * @param Json|null $json
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
@@ -265,13 +275,15 @@ public function __construct(
         ResourceConnection $resource,
         \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Stdlib\StringUtils $string,
-        ProcessingErrorAggregatorInterface $errorAggregator
+        ProcessingErrorAggregatorInterface $errorAggregator,
+        Json $json = null
     ) {
         $this->jsonHelper = $jsonHelper;
         $this->_importExportData = $importExportData;
         $this->_resourceHelper = $resourceHelper;
         $this->string = $string;
         $this->errorAggregator = $errorAggregator;
+        $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
 
         foreach ($this->errorMessageTemplates as $errorCode => $message) {
             $this->getErrorAggregator()->addErrorMessageTemplate($errorCode, $message);
@@ -382,7 +394,7 @@ protected function _saveValidatedBunches()
                 $this->_dataSourceModel->saveBunch($this->getEntityTypeCode(), $this->getBehavior(), $bunchRows);
 
                 $bunchRows = $nextRowBackup;
-                $currentDataSize = strlen(serialize($bunchRows));
+                $currentDataSize = strlen($this->json->serialize($bunchRows));
                 $startNewBunch = false;
                 $nextRowBackup = [];
             }

app/code/Magento/ImportExport/Test/Unit/Model/Import/EntityAbstractTest.php

@@ -60,6 +60,7 @@ protected function _getModelDependencies()
         $importFactory = $this->getMock(\Magento\ImportExport\Model\ImportFactory::class, [], [], '', false);
         $resourceHelper = $this->getMock(\Magento\ImportExport\Model\ResourceModel\Helper::class, [], [], '', false);
         $resource = $this->getMock(\Magento\Framework\App\ResourceConnection::class, [], [], '', false);
+        $json = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false);
 
         $data = [
             'coreString' => $string,
@@ -77,6 +78,7 @@ protected function _getModelDependencies()
                 'bunch_size' => 1,
                 'collection_by_pages_iterator' => 'not_used',
             ],
+            'json' => $json,
         ];
 
         return $data;

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

@@ -1616,4 +1616,28 @@ public function validateRowDataProvider()
             ],
         ];
     }
+
+    /**
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::_saveValidatedBunches
+     */
+    public function testValidateData()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import.csv',
+                'directory' => $directory
+            ]
+        );
+
+        $errors = $this->_model->setParameters(
+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
+        )->setSource($source)->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+    }
 }

dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/EntityAbstractTest.php

@@ -43,7 +43,9 @@ public function testSaveValidatedBunches()
                 $objectManager->get(\Magento\Framework\App\ResourceConnection::class),
                 $objectManager->get(
                     \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface::class
-                )
+                ),
+                [],
+                $objectManager->get(\Magento\Framework\Serialize\Serializer\Json::class)
             ],
             '',
             true,