MAGETWO-62168: Improve field data converter logging and error reporting

slopukhov · slopukhov · commit 9d780f3c7831 · 2017-03-01T17:51:48.000+02:00
diff --git a/lib/internal/Magento/Framework/DB/DataConverter/SerializedToJson.php b/lib/internal/Magento/Framework/DB/DataConverter/SerializedToJson.php
@@ -84,9 +84,10 @@ protected function unserializeValue($value)
                 throw new DataConversionException($errorString, $errorNumber);
             });
             $value = $this->serialize->unserialize($value);
-            restore_error_handler();
         } catch (\Throwable $throwable) {
             throw new DataConversionException($throwable->getMessage());
+        } finally {
+            restore_error_handler();
         }
         return $value;
     }

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,10 @@ protected function unserializeValue($value)`
`84`	`84`	`throw new DataConversionException($errorString, $errorNumber);`
`85`	`85`	`});`
`86`	`86`	`$value = $this->serialize->unserialize($value);`
`87`		`- restore_error_handler();`
`88`	`87`	`} catch (\Throwable $throwable) {`
`89`	`88`	`throw new DataConversionException($throwable->getMessage());`
	`89`	`+ } finally {`
	`90`	`+ restore_error_handler();`
`90`	`91`	`}`
`91`	`92`	`return $value;`
`92`	`93`	`}`