MAGETWO-64465: Investigate and fix post-refactoring issues

Author: rganin

app/code/Magento/Catalog/Model/Product/Option/Type/File.php

@@ -316,22 +316,24 @@ public function prepareForCart()
     public function getFormattedOptionValue($optionValue)
     {
         if ($this->_formattedOptionValue === null) {
-            try {
-                $value = $this->unserializeJsonValue($optionValue);
-
-                $customOptionUrlParams = $this->getCustomOptionUrlParams() ? $this->getCustomOptionUrlParams() : [
-                    'id' => $this->getConfigurationItemOption()->getId(),
-                    'key' => $value['secret_key']
-                ];
-
-                $value['url'] = ['route' => $this->_customOptionDownloadUrl, 'params' => $customOptionUrlParams];
-
-                $this->_formattedOptionValue = $this->_getOptionHtml($value);
-                $this->getConfigurationItemOption()->setValue($this->serializer->serialize($value));
-                return $this->_formattedOptionValue;
-            } catch (\Exception $e) {
-                return $optionValue;
+            if ($optionValue !== 'null') {
+                $value = $this->serializer->unserialize($optionValue);
+                if ($value !== null) {
+                    $customOptionUrlParams = $this->getCustomOptionUrlParams()
+                        ? $this->getCustomOptionUrlParams()
+                        : [
+                            'id' => $this->getConfigurationItemOption()->getId(),
+                            'key' => $value['secret_key']
+                        ];
+
+                    $value['url'] = ['route' => $this->_customOptionDownloadUrl, 'params' => $customOptionUrlParams];
+
+                    $this->_formattedOptionValue = $this->_getOptionHtml($value);
+                    $this->getConfigurationItemOption()->setValue($this->serializer->serialize($value));
+                    return $this->_formattedOptionValue;
+                }
             }
+            return $optionValue;
         }
         return $this->_formattedOptionValue;
     }
@@ -402,16 +404,17 @@ public function getPrintableOptionValue($optionValue)
      */
     public function getEditableOptionValue($optionValue)
     {
-        try {
-            $value = $this->unserializeJsonValue($optionValue);
-            return sprintf(
-                '%s [%d]',
-                $this->_escaper->escapeHtml($value['title']),
-                $this->getConfigurationItemOption()->getId()
-            );
-        } catch (\Exception $e) {
-            return $optionValue;
+        if ($optionValue !== 'null') {
+            $unserializedValue = $this->serializer->unserialize($optionValue);
+            if ($unserializedValue !== null) {
+                return sprintf(
+                    '%s [%d]',
+                    $this->_escaper->escapeHtml($unserializedValue['title']),
+                    $this->getConfigurationItemOption()->getId()
+                );
+            }
         }
+        return $optionValue;
     }
 
     /**
@@ -431,15 +434,14 @@ public function parseOptionValue($optionValue, $productOptionValues)
         if (preg_match('/\[([0-9]+)\]/', $optionValue, $matches)) {
             $confItemOptionId = $matches[1];
             $option = $this->_itemOptionFactory->create()->load($confItemOptionId);
-            try {
-                $this->unserializeJsonValue($option->getValue());
-                return $option->getValue();
-            } catch (\Exception $e) {
-                return null;
+            if ($option->getValue() !== 'null') {
+                $unserializedValue = $this->serializer->unserialize($option->getValue());
+                if ($unserializedValue !== null) {
+                    return $option->getValue();
+                }
             }
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -467,11 +469,13 @@ private function unserializeJsonValue($jsonValue)
      */
     public function prepareOptionValueForRequest($optionValue)
     {
-        try {
-            return $this->unserializeJsonValue($optionValue);
-        } catch (\Exception $e) {
-            return null;
+        if ($optionValue !== 'null') {
+            $unserializedValue = $this->serializer->unserialize($optionValue);
+            if ($unserializedValue !== null) {
+                return $unserializedValue;
+            }
         }
+        return null;
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php

@@ -288,12 +288,7 @@ public function testGetEditableOptionValue()
     public function testGetEditableOptionValueInvalid()
     {
         $fileObject = $this->getFileObject();
-        $optionTitle = 'Option Title';
-        $optionValue = json_encode(['title' => $optionTitle]);
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->with($optionValue)
-            ->willThrowException(new SerializationException(__('Invalid JSON value.')));
+        $optionValue = '#invalid jSoN*(&@#^$(*&';
         $this->escaper->expects($this->never())
             ->method('escapeHtml');