diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename jsonp to callback, defaults to null

Browse Source
This commit is contained in:
Toni Uebernickel 2012-03-20 10:10:35 +01:00
parent 38b79a7023
commit 266f76d963
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Symfony/Component/HttpFoundation/JsonResponse.php
View File

@ -24,27 +24,27 @@ class JsonResponse extends Response
/**
* Constructor.
*
* @param mixed $data The response data
* @param integer $status The response status code
* @param array $headers An array of response headers
* @param string $jsonp A JSONP callback name
* @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(), $jsonp = '')
public function __construct($data = array(), $status = 200, $headers = array(), $callback = null)
{
parent::__construct('', $status, $headers);
$this->setData($data);
$this->setCallback($jsonp);
$this->setCallback($callback);
}
/**
* {@inheritDoc}
*
* @param string $jsonp A JSONP callback name.
* @param string $callback A JSONP callback name.
*/
static public function create($data = array(), $status = 200, $headers = array(), $jsonp = '')
static public function create($data = array(), $status = 200, $headers = array(), $callback = null)
{
return new static($data, $status, $headers, $jsonp = '');
return new static($data, $status, $headers, $callback);
}
/**
@ -54,7 +54,7 @@ class JsonResponse extends Response
*
* @return JsonResponse
*/
public function setCallback($callback)
public function setCallback($callback = null)
{
$this->callback = $callback;
@ -90,7 +90,7 @@ class JsonResponse extends Response
$content = $this->data;
$this->headers->set('Content-Type', 'application/json', false);
if (!empty($this->callback)) {
if ($this->callback) {
$content = sprintf('%s(%s);', $this->callback, $content);
// Not using application/javascript for compatibility reasons with older browsers.
$this->headers->set('Content-Type', 'text/javascript', true);