Fix parsing batched queries (#13)

Author: spawnia

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v2.0.1
+
+### Fixed
+
+- Fix parsing batched queries
+
 ## v2.0.0
 
 ### Changed

src/RequestParser.php

@@ -58,14 +58,27 @@ protected function bodyParams(Request $request): array
             return $this->inlineFiles($request);
         }
 
-        $bodyParams = $request->input();
-
-        if (is_array($bodyParams) && Arr::isAssoc($bodyParams)) {
-            return $bodyParams;
+        if (Str::startsWith($contentType, 'application/graphql') && ! $request->isJson()) {
+            return ['query' => $request->getContent()];
         }
 
-        if (Str::startsWith($contentType, 'application/graphql')) {
-            return ['query' => $request->getContent()];
+        $bodyParams = $request->input();
+
+        if (is_array($bodyParams)) {
+            if (Arr::isAssoc($bodyParams)) {
+                return $bodyParams;
+            }
+            if (count($bodyParams) > 0) {
+                $allAssoc = true;
+                foreach ($bodyParams as $bodyParam) {
+                    if (! is_array($bodyParam) || ! Arr::isAssoc($bodyParam)) {
+                        $allAssoc = false;
+                    }
+                }
+                if ($allAssoc) {
+                    return $bodyParams;
+                }
+            }
         }
 
         if ($request->isJson()) {

tests/Unit/RequestParserTest.php

@@ -108,6 +108,28 @@ public function formContentTypes(): iterable
         yield ['application/x-www-form-urlencoded;bla;blub'];
     }
 
+    public function testPostWithBatchedRequest(): void
+    {
+        $fooQuery = /** @lang GraphQL */ '{ foo }';
+        $barQuery = /** @lang GraphQL */ '{ bar }';
+        $request = $this->makeRequest(
+            'POST',
+            [],
+            [],
+            ['Content-Type' => 'application/json'],
+            \Safe\json_encode([
+                ['query' => $fooQuery],
+                ['query' => $barQuery],
+            ])
+        );
+        $params = (new RequestParser())->parseRequest($request);
+
+        self::assertIsArray($params);
+        [$fooParams, $barParams] = $params;
+        self::assertSame($fooQuery, $fooParams->query);
+        self::assertSame($barQuery, $barParams->query);
+    }
+
     public function testPostDefaultsToRegularForm(): void
     {
         $query = /** @lang GraphQL */ '{ foo }';
@@ -291,7 +313,7 @@ public function testMultipartFormWithoutOperations(): void
      * @param  array<mixed>  $headers
      * @param  string|resource|null  $content
      */
-    public function makeRequest(string $method, array $parameters = [], array $files = [], array $headers = [], $content = null): Request
+    private function makeRequest(string $method, array $parameters = [], array $files = [], array $headers = [], $content = null): Request
     {
         $symfonyRequest = SymfonyRequest::create(
             'http://foo.bar/graphql',