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

- Refactor as getter

Author: Oleksandr Dubovyk

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

@@ -278,7 +278,7 @@ abstract class AbstractEntity
      *
      * @var Json
      */
-    private $json;
+    private $serializer;
 
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
@@ -298,11 +298,9 @@ public function __construct(
         \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
         ResourceConnection $resource,
         ProcessingErrorAggregatorInterface $errorAggregator,
-        array $data = [],
-        Json $json = null
+        array $data = []
     ) {
         $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();
@@ -459,7 +457,7 @@ protected function _saveValidatedBunches()
                         foreach ($entityGroup as $key => $value) {
                             $bunchRows[$key] = $value;
                         }
-                        $productDataSize = strlen($this->json->serialize($bunchRows));
+                        $productDataSize = strlen($this->getSerializer()->serialize($bunchRows));
 
                         /* Check if the new bunch should be started */
                         $isBunchSizeExceeded = ($this->_bunchSize > 0 && count($bunchRows) >= $this->_bunchSize);
@@ -485,6 +483,22 @@ protected function _saveValidatedBunches()
         return $this;
     }
 
+    /**
+     * Get Serializer instance
+     *
+     * Workaround. Only way to implement dependency and not to break inherited child classes
+     *
+     * @return Json
+     * @deprecated
+     */
+    protected function getSerializer()
+    {
+        if (null === $this->serializer) {
+            $this->serializer = ObjectManager::getInstance()->get(Json::class);
+        }
+        return $this->serializer;
+    }
+
     /**
      * Add error with corresponding current data source row number.
      *

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

@@ -253,7 +253,7 @@ abstract class AbstractEntity
      *
      * @var Json
      */
-    private $json;
+    protected $serializer;
 
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
@@ -264,7 +264,6 @@ 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(
@@ -275,15 +274,13 @@ public function __construct(
         ResourceConnection $resource,
         \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Stdlib\StringUtils $string,
-        ProcessingErrorAggregatorInterface $errorAggregator,
-        Json $json = null
+        ProcessingErrorAggregatorInterface $errorAggregator
     ) {
         $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);
@@ -394,7 +391,7 @@ protected function _saveValidatedBunches()
                 $this->_dataSourceModel->saveBunch($this->getEntityTypeCode(), $this->getBehavior(), $bunchRows);
 
                 $bunchRows = $nextRowBackup;
-                $currentDataSize = strlen($this->json->serialize($bunchRows));
+                $currentDataSize = strlen($this->getSerializer()->serialize($bunchRows));
                 $startNewBunch = false;
                 $nextRowBackup = [];
             }
@@ -431,6 +428,22 @@ protected function _saveValidatedBunches()
         return $this;
     }
 
+    /**
+     * Get Serializer instance
+     *
+     * Workaround. Only way to implement dependency and not to break inherited child classes
+     *
+     * @return Json
+     * @deprecated
+     */
+    protected function getSerializer()
+    {
+        if (null === $this->serializer) {
+            $this->serializer = ObjectManager::getInstance()->get(Json::class);
+        }
+        return $this->serializer;
+    }
+
     /**
      * Add error with corresponding current data source row number.
      *

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

@@ -43,9 +43,7 @@ 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,