MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

- custom converters coverage

Author: rganin

app/code/Magento/Sales/Setup/SerializedDataConverter.php

@@ -6,65 +6,37 @@
 
 namespace Magento\Sales\Setup;
 
-use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\DB\DataConverter\DataConversionException;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
 
 /**
  * Serializer used to update nested serialized data in product_options field.
  */
-class SerializedDataConverter implements \Magento\Framework\DB\DataConverter\DataConverterInterface
+class SerializedDataConverter extends SerializedToJson
 {
-    /**
-     * @var Serialize
-     */
-    private $serialize;
-
-    /**
-     * @var Json
-     */
-    private $json;
-
-    /**
-     * SerializedDataConverter constructor.
-     *
-     * @param Serialize $serialize
-     * @param Json $json
-     */
-    public function __construct(
-        Serialize $serialize,
-        Json $json
-    ) {
-        $this->serialize = $serialize;
-        $this->json = $json;
-    }
-
     /**
      * Convert from serialized to JSON format.
      *
      * @param string $value
      * @return string
+     *
+     * @throws DataConversionException
      */
     public function convert($value)
     {
-        $valueUnserialized = $this->serialize->unserialize($value);
+        $valueUnserialized = parent::unserializeValue($value);
         if (isset($valueUnserialized['options'])) {
             foreach ($valueUnserialized['options'] as $key => $option) {
                 if ($option['option_type'] === 'file') {
-                    $valueUnserialized['options'][$key]['option_value'] = $this->json->serialize(
-                        $this->serialize->unserialize(
-                            $option['option_value']
-                        )
-                    );
+                    $valueUnserialized['options'][$key]['option_value'] = parent::convert($option['option_value']);
                 }
             }
         }
         if (isset($valueUnserialized['bundle_selection_attributes'])) {
-            $valueUnserialized['bundle_selection_attributes'] = $this->json->serialize(
-                $this->serialize->unserialize(
+            $valueUnserialized['bundle_selection_attributes'] = parent::convert(
                     $valueUnserialized['bundle_selection_attributes']
-                )
             );
         }
-        return $this->json->serialize($valueUnserialized);
+        return parent::encodeJson($valueUnserialized);
     }
 }

lib/internal/Magento/Framework/DB/DataConverter/SerializedToJson.php

@@ -45,6 +45,18 @@ public function __construct(
      * @throws DataConversionException
      */
     public function convert($value)
+    {
+        return $this->encodeJson($this->unserializeValue($value));
+    }
+
+    /**
+     * Unserialize value
+     *
+     * @param string $value
+     * @return  mixed
+     * @throws DataConversionException
+     */
+    protected function unserializeValue($value)
     {
         try {
             if (PHP_MAJOR_VERSION >= 7) {
@@ -59,6 +71,18 @@ public function convert($value)
         } catch (\Throwable $throwable) {
             throw new DataConversionException($throwable->getMessage());
         }
+        return $value;
+    }
+
+    /**
+     * Ecode value with json encoder
+     *
+     * @param string $value
+     * @return bool|string
+     * @throws DataConversionException
+     */
+    protected function encodeJson($value)
+    {
         $value = $this->json->serialize($value);
         if (json_last_error()) {
             throw new DataConversionException(json_last_error_msg());

lib/internal/Magento/Framework/DB/FieldDataConverter.php

@@ -91,7 +91,7 @@ public function convert(
                         sprintf(
                             "Error converting field `%s` in table `%s` where `%s`=%s using %s."
                             . PHP_EOL
-                            . "Fix data or replace with valid value."
+                            . "Fix data or replace with a valid value."
                             . PHP_EOL
                             . "Failure reason: '%s'",
                             $field,