JavaDevl
diff --git a/‎src/Illuminate/Http/Request.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Illuminate/Http/Request.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/Http/HttpRequestTest.php‎
Lines changed: 8 additions & 0 deletions b/‎tests/Http/HttpRequestTest.php‎
Lines changed: 8 additions & 0 deletions
@@ -174,7 +174,7 @@ public function has($key)
 	 */
 	public function all()
 	{
-		return $this->input() + $this->files->all();
+		return array_merge_recursive($this->input(), $this->files->all());
 	}
 
 	/**
 
@@ -238,6 +238,14 @@ public function testAllInputReturnsInputAndFiles()
 	}
 
 
+	public function testAllInputReturnsNestedInputAndFiles()
+	{
+		$file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', null, array(__FILE__, 'photo.jpg'));
+		$request = Request::create('/?boom=breeze', 'GET', array('foo' => array('bar' => 'baz')), array(), array('foo' => array('photo' => $file)));
+		$this->assertEquals(array('foo' => array('bar' => 'baz', 'photo' => $file), 'boom' => 'breeze'), $request->all());
+	}
+
+
 	public function testOldMethodCallsSession()
 	{
 		$request = Request::create('/', 'GET');
Original file line number	Diff line number	Diff line change
@@ -174,7 +174,7 @@ public function has($key)
174	174	*/
175	175	public function all()
176	176	{
177		- return $this->input() + $this->files->all();
	177	+ return array_merge_recursive($this->input(), $this->files->all());
178	178	}
179	179
180	180	/**
Original file line number	Diff line number	Diff line change
@@ -238,6 +238,14 @@ public function testAllInputReturnsInputAndFiles()
238	238	}
239	239
240	240
	241	+ public function testAllInputReturnsNestedInputAndFiles()
	242	+ {
	243	+ $file = $this->getMock('Symfony\Component\HttpFoundation\File\UploadedFile', null, array(__FILE__, 'photo.jpg'));
	244	+ $request = Request::create('/?boom=breeze', 'GET', array('foo' => array('bar' => 'baz')), array(), array('foo' => array('photo' => $file)));
	245	+ $this->assertEquals(array('foo' => array('bar' => 'baz', 'photo' => $file), 'boom' => 'breeze'), $request->all());
	246	+ }
	247	+
	248	+
241	249	public function testOldMethodCallsSession()
242	250	{
243	251	$request = Request::create('/', 'GET');