Clear json_last_error

GromNaN · fabpot · commit 6d6a3af4ff97 · 2014-09-22T17:58:58.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -107,6 +107,9 @@ public function setData($data = array())
         });
 
         try {
+            // Clear json_last_error()
+            json_encode(null);
+
             $this->data = json_encode($data, $this->encodingOptions);
 
             restore_error_handler();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -203,8 +203,9 @@ public function testSetContent()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
-     * @expectedExceptionMessage This error is expected
+     * @expectedException Exception
+     * @expectedExceptionMessage Failed calling Symfony\Component\HttpFoundation\Tests\JsonSerializableObject::jsonSerialize()
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php#114688
      */
     public function testSetContentJsonSerializeError()
     {

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,9 @@ public function testSetContent()`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`
`206`		`- * @expectedException PHPUnit_Framework_Error_Warning`
`207`		`- * @expectedExceptionMessage This error is expected`
	`206`	`+ * @expectedException Exception`
	`207`	`+ * @expectedExceptionMessage Failed calling Symfony\Component\HttpFoundation\Tests\JsonSerializableObject::jsonSerialize()`
	`208`	`+ * @link http://php.net/manual/en/jsonserializable.jsonserialize.php#114688`
`208`	`209`	`*/`
`209`	`210`	`public function testSetContentJsonSerializeError()`
`210`	`211`	`{`