Merge pull request #752 from magento-troll/MAGETWO-62321

MAGETWO-62321: Remove uses of unserialize in Magento_Eav for attribute validate_rules

Author: Volodymyr Klymenko

app/code/Magento/Customer/Setup/UpgradeData.php

@@ -17,6 +17,8 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\DB\FieldDataConverterFactory;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
 
 /**
  * @codeCoverageIgnore
@@ -51,19 +53,30 @@ class UpgradeData implements UpgradeDataInterface
      */
     private $storeManager;
 
+    /**
+     * @var FieldDataConverterFactory
+     */
+    private $fieldDataConverterFactory;
+
     /**
      * @param CustomerSetupFactory $customerSetupFactory
      * @param IndexerRegistry $indexerRegistry
      * @param \Magento\Eav\Model\Config $eavConfig
+     * @param FieldDataConverterFactory|null $fieldDataConverterFactory
      */
     public function __construct(
         CustomerSetupFactory $customerSetupFactory,
         IndexerRegistry $indexerRegistry,
-        \Magento\Eav\Model\Config $eavConfig
+        \Magento\Eav\Model\Config $eavConfig,
+        FieldDataConverterFactory $fieldDataConverterFactory = null
     ) {
         $this->customerSetupFactory = $customerSetupFactory;
         $this->indexerRegistry = $indexerRegistry;
         $this->eavConfig = $eavConfig;
+
+        $this->fieldDataConverterFactory = $fieldDataConverterFactory ?: ObjectManager::getInstance()->get(
+            FieldDataConverterFactory::class
+        );
     }
 
     /**
@@ -132,6 +145,15 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 throw $e;
             }
         }
+        if (version_compare($context->getVersion(), '2.0.11', '<')) {
+            $fieldDataConverter = $this->fieldDataConverterFactory->create(SerializedToJson::class);
+            $fieldDataConverter->convert(
+                $setup->getConnection(),
+                $setup->getTable('customer_eav_attribute'),
+                'attribute_id',
+                'validate_rules'
+            );
+        }
 
         $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
         $indexer->reindexAll();

app/code/Magento/Customer/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Customer" setup_version="2.0.10">
+    <module name="Magento_Customer" setup_version="2.0.11">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Directory"/>

app/code/Magento/Eav/Model/Attribute.php

@@ -103,7 +103,7 @@ public function getValidateRules()
         if (is_array($rules)) {
             return $rules;
         } elseif (!empty($rules)) {
-            return unserialize($rules);
+            return $this->getSerializer()->unserialize($rules);
         }
         return [];
     }
@@ -119,7 +119,7 @@ public function setValidateRules($rules)
         if (empty($rules)) {
             $rules = null;
         } elseif (is_array($rules)) {
-            $rules = serialize($rules);
+            $rules = $this->getSerializer()->serialize($rules);
         }
         $this->setData('validate_rules', $rules);
 

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php

@@ -8,7 +8,7 @@
 
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Entity/Attribute/Model - attribute abstract
@@ -120,9 +120,9 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
     /**
      * Serializer Instance.
      *
-     * @var SerializerInterface
+     * @var Json
      */
-    private $serializer;
+    protected $serializer;
 
     /**
      * Array of attribute types that have empty string as a possible value.
@@ -197,12 +197,12 @@ public function __construct(
      * Get Serializer instance.
      * @deprecated
      *
-     * @return SerializerInterface
+     * @return Json
      */
-    private function getSerializer()
+    protected function getSerializer()
     {
         if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()->create(SerializerInterface::class);
+            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()->create(Json::class);
         }
 
         return $this->serializer;

app/code/Magento/Eav/Model/ResourceModel/Attribute.php

@@ -45,7 +45,7 @@ protected function _beforeSave(AbstractModel $object)
     {
         $validateRules = $object->getData('validate_rules');
         if (is_array($validateRules)) {
-            $object->setData('validate_rules', serialize($validateRules));
+            $object->setData('validate_rules', $this->getSerializer()->serialize($validateRules));
         }
         return parent::_beforeSave($object);
     }

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php

@@ -144,8 +144,8 @@ public function testGetValidationRulesWhenRuleIsArray()
 
     public function testGetValidationRulesWhenRuleIsSerialized()
     {
-        $rule = serialize('some value');
-        $expected = 'some test result';
+        $rule = json_encode(['some value']);
+        $expected = ['some value'];
 
         $modelClassName = \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class;
         $model = $this->getMockForAbstractClass($modelClassName, [], '', false);

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

@@ -176,7 +176,7 @@ protected function _initAttributes()
                 'table' => $attribute->getBackend()->getTable(),
                 'is_required' => $attribute->getIsRequired(),
                 'is_static' => $attribute->isStatic(),
-                'rules' => $attribute->getValidateRules() ? unserialize($attribute->getValidateRules()) : null,
+                'rules' => $attribute->getValidateRules() ? $attribute->getValidateRules() : null,
                 'type' => \Magento\ImportExport\Model\Import::getAttributeType($attribute),
                 'options' => $this->getAttributeOptions($attribute),
             ];