[Serializer] Fixed throwing exception with option JSON_PARTIAL_OUTPUT_ON_ERROR

diversantvlz · nicolas-grekas · commit 15f098b4a3be · 2018-01-07T11:07:16.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -55,7 +55,8 @@ 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()) {
+        $this->lastError = json_last_error();
+        if (JSON_ERROR_NONE !== $this->lastError && false === $encodedJson) {
             throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
@@ -65,6 +65,16 @@ public function testOptions()
         $this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
     }
 
+    /**
+     * @require PHP 5.5
+     */
+    public function testPartialJson()
+    {
+        $context = array('json_encode_options' => JSON_PARTIAL_OUTPUT_ON_ERROR);
+
+        $this->assertEquals('0', $this->serializer->serialize(NAN, 'json', $context));
+    }
+
     protected function getJsonSource()
     {
         return '{"foo":"foo","bar":["a","b"],"baz":{"key":"val","key2":"val","A B":"bar","item":[{"title":"title1"},{"title":"title2"}],"Barry":{"FooBar":{"Baz":"Ed","@id":1}}},"qux":"1"}';

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public function encode($data, $format, array $context = array())`
`55`	`55`
`56`	`56`	`$encodedJson = json_encode($data, $context['json_encode_options']);`
`57`	`57`
`58`		`- if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {`
	`58`	`+ $this->lastError = json_last_error();`
	`59`	`+ if (JSON_ERROR_NONE !== $this->lastError && false === $encodedJson) {`
`59`	`60`	`throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());`
`60`	`61`	`}`
`61`	`62`