[Serializer] Fixed throwing exception with option JSON_PARTIAL_OUTPUT_ON_ERROR.

diversantvlz · diversantvlz · commit d96856779dde · 2017-12-14T01:14:37.000+03:00
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -95,8 +95,11 @@ public function decode($data, $format, array $context = array())
             $decodedData = json_decode($data, $associative, $recursionDepth);
         }
 
-        if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
+        if (false === $decodedData) {
+            $this->lastError = json_last_error();
+            throw new UnexpectedValueException(
+                sprintf('Json decode error #%s: %s', json_last_error(), json_last_error_msg())
+            );
         }
 
         return $decodedData;
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -55,8 +55,11 @@ public function encode($data, $format, array $context = array())
 
         $encodedJson = json_encode($data, $context['json_encode_options']);
 
-        if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
+        if (false === $encodedJson) {
+            $this->lastError = json_last_error();
+            throw new UnexpectedValueException(
+                sprintf('Json encode error #%s: %s', json_last_error(), json_last_error_msg())
+            );
         }
 
         return $encodedJson;
