Merge branch 'develop' of https://github.com/magento/magento2-sample-data into MAGETWO-62855

Author: Sergii Kovalenko

app/code/Magento/SalesSampleData/Model/Order/Converter.php

@@ -6,6 +6,8 @@
 namespace Magento\SalesSampleData\Model\Order;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Class Converter
@@ -32,22 +34,30 @@ class Converter
      */
     protected $eavConfig;
 
+    /**
+     * @var Json
+     */
+    protected $serializer;
+
     /**
      * @param CustomerRepositoryInterface $customerAccount
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\ConfigurableSampleData\Model\Product\ConverterFactory $productConverterFactory
      * @param \Magento\Eav\Model\Config $eavConfig
+     * @param Json $serializer
      */
     public function __construct(
         CustomerRepositoryInterface $customerAccount,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\ConfigurableSampleData\Model\Product\ConverterFactory $productConverterFactory,
-        \Magento\Eav\Model\Config $eavConfig
+        \Magento\Eav\Model\Config $eavConfig,
+        Json $serializer = null
     ) {
         $this->customerRepository = $customerAccount;
         $this->productFactory = $productFactory;
         $this->productConverter = $productConverterFactory->create();
         $this->eavConfig = $eavConfig;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -164,14 +174,13 @@ protected function getAddresses(\Magento\Customer\Api\Data\AddressInterface $add
      */
     protected function convertProductData($productData)
     {
-        $productValues = unserialize($productData);
+        $productValues = $this->serializer->unserialize($productData);
         $productId = $this->getProductData($productValues['sku'])->getId();
         $productData = ['qty' => $productValues['qty']];
         if (isset($productValues['configurable_options'])) {
             $productData['super_attribute'] = $this->getProductAttributes($productValues['configurable_options']);
         }
         return [$productId => $productData];
-
     }
 
     /**

app/code/Magento/SalesSampleData/fixtures/orders.csv

@@ -1,3 +1,3 @@
 customer_email,currency,shipping_method,payment,product,refund
-"[email protected]",USD,"flatrate_flatrate",checkmo,"a:3:{s:3:""sku"";s:4:""WS03"";s:3:""qty"";s:1:""1"";s:20:""configurable_options"";a:2:{s:4:""size"";s:2:""XS"";s:5:""color"";s:3:""Red"";}}",no
-"[email protected]",USD,"flatrate_flatrate",checkmo,"a:3:{s:3:""sku"";s:4:""WS08"";s:3:""qty"";s:1:""1"";s:20:""configurable_options"";a:2:{s:4:""size"";s:2:""XS"";s:5:""color"";s:4:""Blue"";}}",yes
+"[email protected]",USD,"flatrate_flatrate",checkmo,"{""sku"":""WS03"",""qty"":""1"",""configurable_options"":{""size"":""XS"",""color"":""Red""}}",no
+"[email protected]",USD,"flatrate_flatrate",checkmo,"{""sku"":""WS08"",""qty"":""1"",""configurable_options"":{""size"":""XS"",""color"":""Blue""}}",yes