MAGETWO-66318: Remove usages of serialize/unserialize in CmsSampleData

- address review comments

Author: Joan He

app/code/Magento/Cms/Setup/ContentConverter.php

@@ -10,7 +10,6 @@
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Widget\Helper\Conditions;
 
 /**
  * Convert conditions_encoded part of cms block content data from serialized to JSON format
@@ -71,17 +70,6 @@ public function convert($value)
         return $convertedValue;
     }
 
-    /**
-     * Check if conditions have been converted to JSON
-     *
-     * @param string $value
-     * @return bool
-     */
-    private function isConvertedConditions($value)
-    {
-        return $this->isValidJsonValue($this->normalizer->restoreReservedCharaters($value));
-    }
-
     /**
      * Convert widget parameters from serialized format to JSON format
      *
@@ -95,14 +83,13 @@ private function convertWidgetParams($paramsString)
         $tokenizer->setString($paramsString);
         $widgetParameters = $tokenizer->tokenize();
         if (isset($widgetParameters['conditions_encoded'])) {
-            if ($this->isConvertedConditions($widgetParameters['conditions_encoded'])) {
+            $conditions = $this->normalizer->restoreReservedCharaters($widgetParameters['conditions_encoded']);
+            if ($this->isValidJsonValue($conditions)) {
                 return $paramsString;
             }
-            // Restore WYSIWYG reserved characters in string
-            $conditions = $this->normalizer->restoreReservedCharaters($widgetParameters['conditions_encoded']);
-            $conditions = parent::convert($conditions);
-            // Replace WYSIWYG reserved characters in string
-            $widgetParameters['conditions_encoded'] = $this->normalizer->replaceReservedCharaters($conditions);
+            $widgetParameters['conditions_encoded'] = $this->normalizer->replaceReservedCharaters(
+                parent::convert($conditions)
+            );
             $newParamsString = '';
             foreach ($widgetParameters as $key => $parameter) {
                 $newParamsString .= ' ' . $key . '="' . $parameter . '"';

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

@@ -92,7 +92,7 @@ private function convertWidgetConditionsToJson(ModuleDataSetupInterface $setup)
             'like',
             [
                 'values' => [
-                    'content' => ['%conditions_encoded%']
+                    'content' => '%conditions_encoded%'
                 ]
             ]
         );

app/code/Magento/Widget/Model/Widget/Wysiwyg/Normalizer.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Widget\Model\Widget\Wysiwyg;
 
+/**
+ * Normalize widget content in Wysiwyg editor
+ */
 class Normalizer
 {
 
@@ -31,7 +34,7 @@ public function replaceReservedCharaters($content)
     }
 
     /**
-     * Restore the  reserved characters in the content
+     * Restore the reserved characters in the content
      *
      * @param string $content
      * @return string

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

@@ -73,7 +73,7 @@ private function upgradeVersionTwoZeroOne(ModuleDataSetupInterface $setup)
             'like',
             [
                 'values' => [
-                    'xml' => ['%conditions_encoded%']
+                    'xml' => '%conditions_encoded%'
                 ]
             ]
         );