Merge pull request #393 from philsturgeon/patch-1

Make Input::json() more logical

Author: taylorotwell

src/Illuminate/Http/Request.php

@@ -384,15 +384,22 @@ public function replace(array $input)
 	/**
 	 * Get the JSON payload for the request.
 	 *
-	 * @return object
+	 * @param  string  $key
+	 * @param  mixed   $default
+	 * @return mixed
 	 */
-	public function json()
+	public function json($key = null, $default = null)
 	{
-		$arguments = func_get_args();
+		$mime = $this->retrieveItem('server', 'CONTENT_TYPE', null);
 
-		array_unshift($arguments, $this->getContent());
+		if (strpos($mime, '/json') === false)
+		{
+			return $default;
+		}
+		
+		$json = json_decode($this->getContent(), true);
 
-		return call_user_func_array('json_decode', $arguments);
+		return array_get($json, $key, $default);
 	}
 
 	/**

tests/Http/HttpRequestTest.php

@@ -202,9 +202,12 @@ public function testHeaderMethod()
 
 	public function testJSONMethod()
 	{
-		$request = Request::create('/', 'GET', array(), array(), array(), array(), json_encode(array('taylor' => 'name')));
-		$json = $request->json();
-		$this->assertEquals('name', $json->taylor);
+		$payload = array('name' => 'taylor');
+		$request = Request::create('/', 'GET', array(), array(), array(), array('CONTENT_TYPE' => 'application/json'), json_encode($payload));
+		$name = $request->json('name');
+		$this->assertEquals('taylor', $name);
+		$data = $request->json();
+		$this->assertEquals($payload, $data);
 	}