fixed disable associative config #8

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Use `phpstan` as a dev dependency to detect bugs
+- Fixed disabled associative config, that could return `scalar|array|object` instead only array #8
 
 ## [2.1.0] - 2018-08-04
 

src/JsonPayload.php

@@ -68,12 +68,12 @@ public function options(int $options): self
     /**
      * {@inheritdoc}
      */
-    protected function parse(StreamInterface $stream): array
+    protected function parse(StreamInterface $stream)
     {
         $json = trim((string) $stream);
 
         if ($json === '') {
-            return [];
+            return $this->associative ? [] : null;
         }
 
         $data = json_decode($json, $this->associative, $this->depth, $this->options);
@@ -85,6 +85,10 @@ protected function parse(StreamInterface $stream): array
             throw new Exception(sprintf('JSON: %s', json_last_error_msg()), $code);
         }
 
-        return $data ?: [];
+        if ($this->associative) {
+            return $data ?: [];
+        }
+
+        return $data;
     }
 }

src/Payload.php

@@ -78,7 +78,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     /**
      * Parse the body.
      */
-    abstract protected function parse(StreamInterface $stream): array;
+    abstract protected function parse(StreamInterface $stream);
 
     /**
      * Check whether the request payload need to be processed

src/UrlEncodePayload.php

@@ -17,7 +17,7 @@ class UrlEncodePayload extends Payload implements MiddlewareInterface
     /**
      * {@inheritdoc}
      */
-    protected function parse(StreamInterface $stream): array
+    protected function parse(StreamInterface $stream)
     {
         $string = trim((string) $stream);
         parse_str($string, $data);

tests/PayloadTest.php

@@ -204,4 +204,40 @@ public function testJsonOptions()
             $request
         );
     }
+
+    public function disabledAssociativeProvider()
+    {
+        return [
+            ['{}', (object) []],
+            ['{"foo": "bar"}', (object) ['foo' => 'bar']],
+            ['["foo", "bar"]', ['foo', 'bar']],
+            ['', null],
+        ];
+    }
+
+    /**
+     * @dataProvider disabledAssociativeProvider
+     * @param mixed $expected
+     */
+    public function testAssociativeDisabled(string $body, $expected)
+    {
+        $request = Factory::createServerRequest('POST', '/')
+            ->withHeader('Content-Type', 'application/json');
+
+        $request->getBody()->write($body);
+
+        $response = Dispatcher::run(
+            [
+                (new JsonPayload())->associative(false),
+                function ($request) use ($expected) {
+                    $this->assertEquals($expected, $request->getParsedBody());
+
+                    echo 'Ok';
+                },
+            ],
+            $request
+        );
+
+        $this->assertEquals('Ok', (string) $response->getBody());
+    }
 }