Merge pull request laravel#3660 from GrahamCampbell/4.1-json

taylorotwell · taylorotwell · commit 475e7ca78469 · 2014-02-28T08:09:36.000-06:00
Allow Json Encoding Options To Be Set On The Json Response
diff --git a/src/Illuminate/Http/JsonResponse.php b/src/Illuminate/Http/JsonResponse.php
@@ -5,6 +5,28 @@
 
 class JsonResponse extends \Symfony\Component\HttpFoundation\JsonResponse {
 
+	/**
+	 * The json encoding options.
+	 *
+	 * @var int
+	 */
+	protected $jsonOptions;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param  mixed  $data
+	 * @param  int    $status
+	 * @param  array  $headers
+	 * @param  int    $options
+	*/
+	public function __construct($data = null, $status = 200, $headers = array(), $options = 0)
+	{
+		$this->jsonOptions = $options;
+
+		parent::__construct($data, $status, $headers);
+	}
+
 	/**
 	 * Get the json_decoded data from the response
 	 *
@@ -13,8 +35,11 @@ class JsonResponse extends \Symfony\Component\HttpFoundation\JsonResponse {
 	 * @param  int  $options
 	 * @return mixed
 	 */
-	public function getData($assoc = false, $depth = 512, $options = 0)
+	public function getData($assoc = false, $depth = 512, $options = null)
 	{
+		if (is_null($options))
+			$options = $this->jsonOptions;
+
 		return json_decode($this->data, $assoc, $depth, $options);
 	}
 
@@ -23,7 +48,7 @@ public function getData($assoc = false, $depth = 512, $options = 0)
 	 */
 	public function setData($data = array())
 	{
-		$this->data = $data instanceof JsonableInterface ? $data->toJson() : json_encode($data);
+		$this->data = $data instanceof JsonableInterface ? $data->toJson($this->jsonOptions) : json_encode($data, $this->jsonOptions);
 
 		return $this->update();
 	}
@@ -56,4 +81,4 @@ public function withCookie(Cookie $cookie)
 		return $this;
 	}
 
-}
+}
diff --git a/src/Illuminate/Support/Facades/Response.php b/src/Illuminate/Support/Facades/Response.php
@@ -51,16 +51,17 @@ public static function view($view, $data = array(), $status = 200, array $header
 	 * @param  string|array  $data
 	 * @param  int    $status
 	 * @param  array  $headers
+	 * @param  int    $options
 	 * @return \Illuminate\Http\JsonResponse
 	 */
-	public static function json($data = array(), $status = 200, array $headers = array())
+	public static function json($data = array(), $status = 200, array $headers = array(), $options = 0)
 	{
 		if ($data instanceof ArrayableInterface)
 		{
 			$data = $data->toArray();
 		}
 
-		return new JsonResponse($data, $status, $headers);
+		return new JsonResponse($data, $status, $headers, $options);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -51,16 +51,17 @@ public static function view($view, $data = array(), $status = 200, array $header`
`51`	`51`	`* @param string\|array $data`
`52`	`52`	`* @param int $status`
`53`	`53`	`* @param array $headers`
	`54`	`+ * @param int $options`
`54`	`55`	`* @return \Illuminate\Http\JsonResponse`
`55`	`56`	`*/`
`56`		`- public static function json($data = array(), $status = 200, array $headers = array())`
	`57`	`+ public static function json($data = array(), $status = 200, array $headers = array(), $options = 0)`
`57`	`58`	`{`
`58`	`59`	`if ($data instanceof ArrayableInterface)`
`59`	`60`	`{`
`60`	`61`	`$data = $data->toArray();`
`61`	`62`	`}`
`62`	`63`
`63`		`- return new JsonResponse($data, $status, $headers);`
	`64`	`+ return new JsonResponse($data, $status, $headers, $options);`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`/**`