[HttpFoundation] Silent only JSON errors

GromNaN · fabpot · commit ddf95c7adc5f · 2014-09-22T17:58:58.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -95,7 +95,20 @@ public function setCallback($callback = null)
      */
     public function setData($data = array())
     {
-        $this->data = @json_encode($data, $this->encodingOptions);
+        $errorHandler = null;
+        $errorHandler = set_error_handler(function () use (&$errorHandler) {
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                return;
+            }
+
+            if ($errorHandler) {
+                call_user_func_array($errorHandler, func_get_args());
+            }
+        });
+
+        $this->data = json_encode($data, $this->encodingOptions);
+
+        restore_error_handler();
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new \InvalidArgumentException($this->transformJsonError());
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -201,4 +201,31 @@ public function testSetContent()
     {
         JsonResponse::create("\xB1\x31");
     }
+
+    /**
+     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedExceptionMessage This error is expected
+     */
+    public function testSetContentJsonSerializeError()
+    {
+        if (!interface_exists('JsonSerializable')) {
+            $this->markTestSkipped('Interface JsonSerializable is available in PHP 5.4+');
+        }
+
+        $serializable = new JsonSerializableObject();
+
+        JsonResponse::create($serializable);
+    }
+}
+
+if (interface_exists('JsonSerializable')) {
+    class JsonSerializableObject implements JsonSerializable
+    {
+        public function jsonSerialize()
+        {
+            trigger_error('This error is expected', E_USER_WARNING);
+
+            return array();
+        }
+    }
 }
