Merge pull request magento#40 from magento-troll/MAGETWO-58456

MAGETWO-58456: Remove uses of unserialize in \Magento\Rule\Model\AbstractModel and its child classes and their usages

Author: rganin

app/code/Magento/CatalogRuleSampleData/Model/Rule.php

@@ -8,6 +8,8 @@
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 use Magento\CatalogRule\Model\RuleFactory as RuleFactory;
 use Magento\CatalogRule\Model\Rule\JobFactory as JobFactory;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\App\ObjectManager;
 
 /**
  *  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -49,21 +51,28 @@ class Rule
      */
     protected $jobFactory;
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
     /**
      * @param SampleDataContext $sampleDataContext
      * @param RuleFactory $ruleFactory
      * @param JobFactory $jobFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
      * @param \Magento\Customer\Model\GroupFactory $groupFactory
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
+     * @param Json $serializer Optional parameter to preserve backward compatibility
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
         RuleFactory $ruleFactory,
         JobFactory $jobFactory,
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
         \Magento\Customer\Model\GroupFactory $groupFactory,
-        \Magento\Store\Model\WebsiteFactory $websiteFactory
+        \Magento\Store\Model\WebsiteFactory $websiteFactory,
+        Json $serializer = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
@@ -72,6 +81,7 @@ public function __construct(
         $this->categoryCollectionFactory = $categoryCollectionFactory;
         $this->groupFactory = $groupFactory;
         $this->websiteFactory = $websiteFactory;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -130,7 +140,11 @@ public function convertSerializedData($data)
                 }
             }
             if (!empty($replacement)) {
-                $data = preg_replace('/' . $matches[0][$matchedId] . '/', serialize($replacement), $data);
+                $data = preg_replace(
+                    '/' . $matches[0][$matchedId] . '/',
+                    $this->serializer->serialize($replacement),
+                    $data
+                );
             }
         }
         return $data;

app/code/Magento/CatalogRuleSampleData/fixtures/catalog_rules.csv

@@ -1,2 +1,2 @@
 name,description,simple_action,discount_amount,is_active,conditions_serialized,actions_serialized
-"20% off all Women’s and Men’s Pants","20% off all Women’s and Men’s Pants","by_percent",20,1,"a:7:{s:4:""type"";s:48:""Magento\CatalogRule\Model\Rule\Condition\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:5:{s:4:""type"";s:48:""Magento\CatalogRule\Model\Rule\Condition\Product"";s:9:""attribute"";s:12:""category_ids"";s:8:""operator"";s:2:""()"";s:5:""value"";%url_key=pants-women,url_key=pants-men%s:18:""is_value_processed"";b:0;}}}","a:4:{s:4:""type"";s:48:""Magento\CatalogRule\Model\Rule\Action\Collection"";s:9:""attribute"";N;s:8:""operator"";s:1:""="";s:5:""value"";N;}"
+"20% off all Women’s and Men’s Pants","20% off all Women’s and Men’s Pants","by_percent",20,1,"{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":""is_value_processed"",""0"":false}]}","{""type"":""Magento\\CatalogRule\\Model\\Rule\\Action\\Collection"",""attribute"":null,""operator"":""="",""value"":null}"

app/code/Magento/SalesRuleSampleData/fixtures/sales_rules.csv

@@ -1,5 +1,5 @@
 name,description,simple_action,discount_amount,discount_step,is_active,stop_rules_processing,is_rss,apply_to_shipping,simple_free_shipping,coupon_type,coupon_code,uses_per_customer,conditions_serialized,actions_serialized
-"Buy 3 tee shirts and get the 4th free","Buy 3 tee shirts and get the 4th free","buy_x_get_y",1,3,1,0,1,0,0,1,,,"a:7:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:7:{s:4:""type"";s:52:""Magento\SalesRule\Model\Rule\Condition\Product\Found"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:5:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Product"";s:9:""attribute"";s:12:""category_ids"";s:8:""operator"";s:2:""()"";s:5:""value"";%url_key=tees-women,url_key=tees-men%s:18:""is_value_processed"";b:0;}}}}}","a:6:{s:4:""type"";s:54:""Magento\SalesRule\Model\Rule\Condition\Product\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";}"
-"Spend $50 or more - shipping is free!","Free shipping on any purchase over $50","by_percent",0,0,1,0,1,0,2,1,,,"a:7:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:5:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Address"";s:9:""attribute"";s:13:""base_subtotal"";s:8:""operator"";s:2:"">="";s:5:""value"";s:2:""50"";s:18:""is_value_processed"";b:0;}}}","a:6:{s:4:""type"";s:54:""Magento\SalesRule\Model\Rule\Condition\Product\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";}"
-"20% OFF Ever $200-plus purchase!*","Shopping cart price rule for the cart over $200. Does not applied on other sales items","by_percent",20,0,1,0,1,0,0,1,,,"a:7:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:5:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Address"";s:9:""attribute"";s:13:""base_subtotal"";s:8:""operator"";s:2:"">="";s:5:""value"";s:3:""200"";s:18:""is_value_processed"";b:0;}}}","a:7:{s:4:""type"";s:54:""Magento\SalesRule\Model\Rule\Condition\Product\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:7:{s:4:""type"";s:54:""Magento\SalesRule\Model\Rule\Condition\Product\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""0"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:2:{i:0;a:5:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Product"";s:9:""attribute"";s:12:""category_ids"";s:8:""operator"";s:2:""=="";s:5:""value"";%url_key=watches%s:18:""is_value_processed"";b:0;}i:1;a:5:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Product"";s:9:""attribute"";s:4:""sale"";s:8:""operator"";s:2:""=="";s:5:""value"";s:1:""1"";s:18:""is_value_processed"";b:0;}}}}}"
-"$4 Luma water bottle (save 70%)","Use promo code H20 at checkout","by_percent",70,0,1,0,1,0,0,2,H20,1,"a:7:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:6:{s:4:""type"";s:52:""Magento\SalesRule\Model\Rule\Condition\Product\Found"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";}}}","a:7:{s:4:""type"";s:54:""Magento\SalesRule\Model\Rule\Condition\Product\Combine"";s:9:""attribute"";N;s:8:""operator"";N;s:5:""value"";s:1:""1"";s:18:""is_value_processed"";N;s:10:""aggregator"";s:3:""all"";s:10:""conditions"";a:1:{i:0;a:5:{s:4:""type"";s:46:""Magento\SalesRule\Model\Rule\Condition\Product"";s:9:""attribute"";s:3:""sku"";s:8:""operator"";s:2:""=="";s:5:""value"";s:7:""24-UG06"";s:18:""is_value_processed"";b:0;}}}"
+"Buy 3 tee shirts and get the 4th free","Buy 3 tee shirts and get the 4th free","buy_x_get_y",1,3,1,0,1,0,0,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Found"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":""url_key=tees-women,url_key=tees-men"",""is_value_processed"":false}]}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}"
+"Spend $50 or more - shipping is free!","Free shipping on any purchase over $50","by_percent",0,0,1,0,1,0,2,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Address"",""attribute"":""base_subtotal"",""operator"":"">="",""value"":""50"",""is_value_processed"":false}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}"
+"20% OFF Ever $200-plus purchase!*","Shopping cart price rule for the cart over $200. Does not applied on other sales items","by_percent",20,0,1,0,1,0,0,1,,,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Address"",""attribute"":""base_subtotal"",""operator"":"">="",""value"":""200"",""is_value_processed"":false}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""0"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""=="",""value"":""url_key=watches"",""is_value_processed"":false},{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""sale"",""operator"":""=="",""value"":""1"",""is_value_processed"":false}]}]}"
+"$4 Luma water bottle (save 70%)","Use promo code H20 at checkout","by_percent",70,0,1,0,1,0,0,2,H20,1,"{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Found"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all""}]}","{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\SalesRule\\Model\\Rule\\Condition\\Product"",""attribute"":""sku"",""operator"":""=="",""value"":""24-UG06"",""is_value_processed"":false}]}"