symfony
diff --git a/‎src/Symfony/Component/Serializer/Encoder/JsonEncode.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Serializer/Encoder/JsonEncode.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+39Lines changed: 39 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+39Lines changed: 39 additions & 0 deletions
@@ -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());
         }
 
 
@@ -65,6 +65,45 @@ public function testOptions()
         $this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
     }
 
+    public function testEncodeNotUtf8WithoutPartialOnError()
+    {
+        $arr = array(
+            'utf8' => 'Hello World!',
+            'notUtf8' => "\xb0\xd0\xb5\xd0",
+        );
+
+        $this->expectException(\Exception::class);
+        $this->encoder->encode($arr, 'json');
+    }
+
+    /**
+     * @requires PHP 5.5
+     */
+    public function testEncodeNotUtf8WithPartialOnError()
+    {
+        $context = array('json_encode_options' => JSON_PARTIAL_OUTPUT_ON_ERROR);
+
+        $arr = array(
+            'utf8' => 'Hello World!',
+            'notUtf8' => "\xb0\xd0\xb5\xd0",
+        );
+
+        $result = $this->encoder->encode($arr, 'json', $context);
+        $jsonLastError = json_last_error();
+
+        $this->assertSame(JSON_ERROR_UTF8, $jsonLastError);
+        $this->assertEquals('{"utf8":"Hello World!","notUtf8":null}', $result);
+
+        $this->assertEquals('0', $this->serializer->serialize(NAN, 'json', $context));
+    }
+
+    public function testDecodeFalseString()
+    {
+        $result = $this->encoder->decode('false', 'json');
+        $this->assertSame(JSON_ERROR_NONE, json_last_error());
+        $this->assertFalse($result);
+    }
+
     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`