Removed $keepOriginalBody constructor argument and renamed $value to …

…$parser
reactphp · Sep 25, 2017 · 485793c · 485793c
1 parent a4e9092
commit 485793c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 42 deletions.
diff --git a/src/Middleware/RequestBodyParserMiddleware.php b/src/Middleware/RequestBodyParserMiddleware.php
@@ -6,15 +6,10 @@
 
 final class RequestBodyParserMiddleware
 {
-    private $keepOriginalBody;
     private $types = array();
 
-    /**
-     * @param bool $keepOriginalBody Keep the original body after parsing or not
-     */
-    public function __construct($keepOriginalBody = false)
+    public function __construct()
     {
-        $this->keepOriginalBody = $keepOriginalBody;
         $this->addType('application/x-www-form-urlencoded', function (ServerRequestInterface $request) {
             $ret = array();
             parse_str((string)$request->getBody(), $ret);
@@ -37,15 +32,13 @@ public function __invoke(ServerRequestInterface $request, $next)
         }
 
         try {
-            $value = $this->types[$type];
+            $parser = $this->types[$type];
             /** @var ServerRequestInterface $request */
-            $request = $value($request);
+            $request = $parser($request);
         } catch (\Exception $e) {
             return $next($request);
-        }
-
-        if (!$this->keepOriginalBody) {
-            $request = $request->withBody(Psr7\stream_for());
+        } catch (\Throwable $t) {
+            return $next($request);
         }
 
         return $next($request);

diff --git a/tests/Middleware/RequestBodyParserMiddlewareTest.php b/tests/Middleware/RequestBodyParserMiddlewareTest.php
@@ -37,38 +37,9 @@ function (ServerRequestInterface $request) {
             }
         );
 
-        $this->assertSame('parsed', $parsedRequest->getParsedBody());
-        $this->assertSame('', (string)$parsedRequest->getBody());
-    }
-
-    public function testParseKeepBody()
-    {
-        $middleware = new RequestBodyParserMiddleware(true);
-        $middleware->addType('react/http', function (ServerRequestInterface $request) {
-            return $request->withParsedBody('parsed');
-        });
-
-        $request = new ServerRequest(
-            200,
-            'https://example.com/',
-            array(
-                'Content-Type' => 'react/http',
-            ),
-            'not yet parsed'
-        );
-
-        /** @var ServerRequestInterface $parsedRequest */
-        $parsedRequest = $middleware(
-            $request,
-            function (ServerRequestInterface $request) {
-                return $request;
-            }
-        );
-
         $this->assertSame('parsed', $parsedRequest->getParsedBody());
         $this->assertSame('not yet parsed', (string)$parsedRequest->getBody());
     }
-
     public function testFormUrlencodedParsing()
     {
         $middleware = new RequestBodyParserMiddleware();
@@ -110,6 +81,6 @@ function (ServerRequestInterface $request) {
             ),
             $parsedRequest->getParsedBody()
         );
-        $this->assertSame('', (string)$parsedRequest->getBody());
+        $this->assertSame('foo=bar&baz[]=cheese&bar[]=beer&bar[]=wine&market[fish]=salmon&market[meat][]=beef&market[meat][]=chicken&market[]=bazaar', (string)$parsedRequest->getBody());
     }
 }