From 4a43453db8c9f1509a6e86e7bdc78437fc367ea1 Mon Sep 17 00:00:00 2001
From: Toni Uebernickel <tuebernickel@gmail.com>
Date: Wed, 21 Mar 2012 22:40:19 +0100
Subject: [PATCH] remove callback from constructor and create method

---
 src/Symfony/Component/HttpFoundation/JsonResponse.php  | 10 +++-------
 .../Component/HttpFoundation/JsonResponseTest.php      |  8 --------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index c04b55a658..85b607132e 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -27,24 +27,20 @@ class JsonResponse extends Response
      * @param mixed   $data     The response data
      * @param integer $status   The response status code
      * @param array   $headers  An array of response headers
-     * @param string  $callback A JSONP callback name
      */
-    public function __construct($data = array(), $status = 200, $headers = array(), $callback = null)
+    public function __construct($data = array(), $status = 200, $headers = array())
     {
         parent::__construct('', $status, $headers);
 
         $this->setData($data);
-        $this->setCallback($callback);
     }
 
     /**
      * {@inheritDoc}
-     *
-     * @param string  $callback A JSONP callback name.
      */
-    static public function create($data = array(), $status = 200, $headers = array(), $callback = null)
+    static public function create($data = array(), $status = 200, $headers = array())
     {
-        return new static($data, $status, $headers, $callback);
+        return new static($data, $status, $headers);
     }
 
     /**
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/JsonResponseTest.php b/tests/Symfony/Tests/Component/HttpFoundation/JsonResponseTest.php
index 6b08967932..d95f46f897 100644
--- a/tests/Symfony/Tests/Component/HttpFoundation/JsonResponseTest.php
+++ b/tests/Symfony/Tests/Component/HttpFoundation/JsonResponseTest.php
@@ -89,14 +89,6 @@ class JsonResponseTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(204, $response->getStatusCode());
     }
 
-    public function testJsonp()
-    {
-        $response = new JsonResponse(array('foo' => 'bar'), 200, array(), 'callback');
-
-        $this->assertEquals('callback({"foo":"bar"});', $response->getContent());
-        $this->assertEquals('text/javascript', $response->headers->get('Content-Type'));
-    }
-
     public function testSetCallback()
     {
         $response = JsonResponse::create(array('foo' => 'bar'))->setCallback('callback');