Merge branch 'return-null-from-get-parsed-body' into 3.x

Closes #1808 Fixes #1807
slimphp · Mar 10, 2016 · 3e24602 · 3e24602
2 parents 1d99b88 + 250bdbe
commit 3e24602
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Slim/Http/Request.php b/Slim/Http/Request.php
@@ -978,9 +978,10 @@ public function getParsedBody()
                 );
             }
             $this->bodyParsed = $parsed;
+            return $this->bodyParsed;
         }
 
-        return $this->bodyParsed;
+        return null;
     }
 
     /**

diff --git a/tests/Http/RequestTest.php b/tests/Http/RequestTest.php
@@ -20,9 +20,9 @@
 
 class RequestTest extends \PHPUnit_Framework_TestCase
 {
-    public function requestFactory()
+    public function requestFactory($envData = [])
     {
-        $env = Environment::mock();
+        $env = Environment::mock($envData);
 
         $uri = Uri::createFromString('https://example.com:443/foo/bar?abc=123');
         $headers = Headers::createFromEnvironment($env);
@@ -836,6 +836,24 @@ public function testWithParsedBodyNull()
         $this->assertNull($clone->getParsedBody());
     }
 
+    public function testGetParsedBodyReturnsNullWhenThereIsNoBodyData()
+    {
+        $request = $this->requestFactory(['REQUEST_METHOD' => 'POST']);
+
+        $this->assertNull($request->getParsedBody());
+    }
+
+    public function testGetParsedBodyReturnsNullWhenThereIsNoMediaTypeParserRegistered()
+    {
+        $request = $this->requestFactory([
+            'REQUEST_METHOD' => 'POST',
+            'CONTENT_TYPE' => 'text/csv',
+        ]);
+        $request->getBody()->write('foo,bar,baz');
+
+        $this->assertNull($request->getParsedBody());
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */