Merge pull request #6 from psfpro/patch-1

Fix BodyParamsMiddleware: Valid JSON containing a scalar value causes InvalidArgumentException
mezzio · Apr 20, 2021 · 5521434 · 5521434
2 parents 6262786 + 05d3233
commit 5521434
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/phpcs.xml → phpcs.xml.dist b/phpcs.xml → phpcs.xml.dist
diff --git a/src/BodyParams/JsonStrategy.php b/src/BodyParams/JsonStrategy.php
@@ -55,6 +55,10 @@ public function parse(ServerRequestInterface $request) : ServerRequestInterface
             ));
         }
 
+        if (! is_array($parsedBody)) {
+            $parsedBody = null;
+        }
+
         return $request
             ->withAttribute('rawBody', $rawBody)
             ->withParsedBody($parsedBody);

diff --git a/test/BodyParams/JsonStrategyTest.php b/test/BodyParams/JsonStrategyTest.php
@@ -145,4 +145,37 @@ public function testEmptyRequestBodyIsNotJsonDecoded(): void
 
         $this->assertSame(json_last_error(), JSON_ERROR_NONE);
     }
+
+    /** @psalm-return iterable<string, array{0: string}> */
+    public function provideNonArrayJsonRequestBody(): iterable
+    {
+        yield 'null'    => ['null'];
+        yield 'true'    => ['true'];
+        yield 'false'   => ['false'];
+        yield 'integer' => ['1'];
+        yield 'float'   => ['1.0'];
+        yield 'string'  => ['"string"'];
+    }
+
+    /**
+     * @dataProvider provideNonArrayJsonRequestBody
+     */
+    public function testParsedBodyEvaluatingToNonArrayValueResultsInNull(string $json): void
+    {
+        $stream = $this->prophesize(StreamInterface::class);
+        $stream->__toString()->willReturn($json);
+        $request = $this->prophesize(ServerRequestInterface::class);
+        $request->getBody()->willReturn($stream->reveal());
+        $request->withAttribute('rawBody', $json)->will(function () use ($request) {
+            return $request->reveal();
+        });
+        $request
+            ->withParsedBody(null)
+            ->will(function () use ($request) {
+                return $request->reveal();
+            })
+            ->shouldBeCalled();
+
+        $this->strategy->parse($request->reveal());
+    }
 }