Merge pull request #7052 from hannesvdvreken/4.2

[4.2] Correctly fill the $request->request parameter bag on creation

Author: taylorotwell

src/Illuminate/Http/Request.php

@@ -572,12 +572,20 @@ public static function createFromBase(SymfonyRequest $request)
 	{
 		if ($request instanceof static) return $request;
 
-		return (new static)->duplicate(
+		$content = $request->content;
+
+		$request = (new static)->duplicate(
 
 			$request->query->all(), $request->request->all(), $request->attributes->all(),
 
 			$request->cookies->all(), $request->files->all(), $request->server->all()
 		);
+
+		$request->content = $content;
+
+		$request->request = $request->getInputSource();
+
+		return $request;
 	}
 
 	/**

tests/Http/HttpRequestTest.php

@@ -2,6 +2,7 @@
 
 use Mockery as m;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 class HttpRequestTest extends PHPUnit_Framework_TestCase {
 
@@ -392,4 +393,23 @@ public function testSessionMethod()
 		$request->session();
 	}
 
+
+	public function testCreateFromBase()
+	{
+		$body = [
+			'foo' => 'bar',
+			'baz' => ['qux'],
+		];
+
+		$server = array(
+			'CONTENT_TYPE' => 'application/json',
+		);
+
+		$base = SymfonyRequest::create('/', 'GET', array(), array(), array(), $server, json_encode($body));
+
+		$request = Request::createFromBase($base);
+
+		$this->assertEquals($request->request->all(), $body);
+	}
+
 }