Merge pull request laravel#5849 from lucasmichot/4.2-http-getjsonoptions

taylorotwell · taylorotwell · commit bfd6b43d1f1b · 2014-09-26T20:14:18.000-05:00
[4.2] Http : add getJsonOptions to JsonResponse
diff --git a/src/Illuminate/Http/JsonResponse.php b/src/Illuminate/Http/JsonResponse.php
@@ -65,4 +65,14 @@ public function setJsonOptions($options)
 		return $this->setData($this->getData());
 	}
 
+	/**
+	 * Get the JSON encoding options.
+	 *
+	 * @return int
+	 */
+	public function getJsonOptions()
+	{
+		return $this->jsonOptions;
+	}
+
 }
diff --git a/tests/Http/HttpJsonResponseTest.php b/tests/Http/HttpJsonResponseTest.php
@@ -10,4 +10,11 @@ public function testSetAndRetrieveData()
 		$this->assertEquals('bar', $data->foo);
 	}
 
+	public function testSetAndRetrieveOptions()
+	{
+		$response = new Illuminate\Http\JsonResponse(['foo' => 'bar']);
+		$response->setJsonOptions(JSON_PRETTY_PRINT);
+		$this->assertSame(JSON_PRETTY_PRINT, $response->getJsonOptions());
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,14 @@ public function setJsonOptions($options)`
`65`	`65`	`return $this->setData($this->getData());`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ /**`
	`69`	`+ * Get the JSON encoding options.`
	`70`	`+ *`
	`71`	`+ * @return int`
	`72`	`+ */`
	`73`	`+ public function getJsonOptions()`
	`74`	`+ {`
	`75`	`+ return $this->jsonOptions;`
	`76`	`+ }`
	`77`	`+`
`68`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,11 @@ public function testSetAndRetrieveData()`
`10`	`10`	`$this->assertEquals('bar', $data->foo);`
`11`	`11`	`}`
`12`	`12`
	`13`	`+ public function testSetAndRetrieveOptions()`
	`14`	`+ {`
	`15`	`+ $response = new Illuminate\Http\JsonResponse(['foo' => 'bar']);`
	`16`	`+ $response->setJsonOptions(JSON_PRETTY_PRINT);`
	`17`	`+ $this->assertSame(JSON_PRETTY_PRINT, $response->getJsonOptions());`
	`18`	`+ }`
	`19`	`+`
`13`	`20`	`}`