Merge pull request #6 from jiripudil/patch-1

Psr7RequestFactory::fromNette() preserves original raw body

Author: Milan Felix Šulc

src/Psr7RequestFactory.php

@@ -2,9 +2,9 @@
 
 namespace Contributte\Psr7;
 
-use GuzzleHttp\Psr7\LazyOpenStream;
 use Nette\Http\IRequest;
 use Nette\Http\RequestFactory;
+use function GuzzleHttp\Psr7\stream_for;
 
 /**
  * @author Milan Felix Sulc <sulcmil@gmail.com>
@@ -32,7 +32,7 @@ public static function fromNette(IRequest $request)
 			$request->getMethod(),
 			$request->getUrl() ? Psr7UriFactory::fromNette($request->getUrl()) : NULL,
 			$request->getHeaders(),
-			new LazyOpenStream('php://input', 'r+'),
+			stream_for($request->getRawBody()),
 			str_replace('HTTP/', '', $request->getHeader('SERVER_PROTOCOL', '1.1'))
 		);
 

src/Psr7ServerRequestFactory.php

@@ -2,9 +2,9 @@
 
 namespace Contributte\Psr7;
 
-use GuzzleHttp\Psr7\LazyOpenStream;
 use Nette\Http\IRequest;
 use Nette\Http\RequestFactory;
+use function GuzzleHttp\Psr7\stream_for;
 
 /**
  * @author Milan Felix Sulc <sulcmil@gmail.com>
@@ -40,7 +40,7 @@ public static function fromNette(IRequest $request)
 			$request->getMethod(),
 			$request->getUrl() ? Psr7UriFactory::fromNette($request->getUrl()) : NULL,
 			$request->getHeaders(),
-			new LazyOpenStream('php://input', 'r+'),
+			stream_for($request->getRawBody()),
 			str_replace('HTTP/', '', $request->getHeader('SERVER_PROTOCOL', '1.1')),
 			$_SERVER
 		);

tests/cases/Psr7ServerRequestFactory.phpt

@@ -32,6 +32,26 @@ test(function () {
 	Assert::equal(['foo' => 'bar'], $request->getParsedBody());
 });
 
+// RawBody
+test(function () {
+	$nette = new Request(
+		new UrlScript('https://nette.org'),
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		function () {
+			return '{"foo":"bar"}';
+		}
+	);
+	$request = Psr7ServerRequestFactory::fromNette($nette);
+	Assert::same('{"foo":"bar"}', (string) $request->getBody());
+});
+
 // Global
 test(function () {
 	$_SERVER['REQUEST_METHOD'] = 'POST';