Merge branch 'moritz-h-3.x' into 4.x

Forward port #2066
slimphp · Mar 18, 2017 · d839e5a · d839e5a
2 parents dd94c56 + dc5092c
commit d839e5a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/Slim/Http/Request.php b/Slim/Http/Request.php
@@ -202,7 +202,11 @@ public function __construct(
         }
 
         $this->registerMediaTypeParser('application/json', function ($input) {
-            return json_decode($input, true);
+            $result = json_decode($input, true);
+            if (!is_array($result)) {
+                return null;
+            }
+            return $result;
         });
 
         $this->registerMediaTypeParser('application/xml', function ($input) {

diff --git a/tests/Http/RequestTest.php b/tests/Http/RequestTest.php
@@ -787,6 +787,36 @@ public function testGetParsedBodyJson()
         $this->assertEquals(['foo' => 'bar'], $request->getParsedBody());
     }
 
+    public function testGetParsedBodyInvalidJson()
+    {
+        $method = 'GET';
+        $uri = new Uri('https', 'example.com', 443, '/foo/bar', 'abc=123', '', '');
+        $headers = new Headers();
+        $headers->set('Content-Type', 'application/json;charset=utf8');
+        $cookies = [];
+        $serverParams = [];
+        $body = new RequestBody();
+        $body->write('{foo}bar');
+        $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body);
+
+        $this->assertNull($request->getParsedBody());
+    }
+
+    public function testGetParsedBodySemiValidJson()
+    {
+        $method = 'GET';
+        $uri = new Uri('https', 'example.com', 443, '/foo/bar', 'abc=123', '', '');
+        $headers = new Headers();
+        $headers->set('Content-Type', 'application/json;charset=utf8');
+        $cookies = [];
+        $serverParams = [];
+        $body = new RequestBody();
+        $body->write('"foo bar"');
+        $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body);
+
+        $this->assertNull($request->getParsedBody());
+    }
+
     public function testGetParsedBodyWithJsonStructuredSuffix()
     {
         $method = 'GET';