Merge branch '5.x' into mp-release-6

# Conflicts:
#	CHANGELOG.md

Author: mfn

CHANGELOG.md

@@ -1,12 +1,16 @@
 CHANGELOG
 =========
 
-[Next release](https://github.com/rebing/graphql-laravel/compare/6.0.0-rc1...master)
+[Next release](https://github.com/rebing/graphql-laravel/compare/6.0.0...master)
 --------------
 
+2020-11-26, 6.0.0
+-----------------
+### Fixed
+- Implemented generation of a SyntaxError instead of an hard Exception for empty single/batch queries [\#685 / plivius](https://github.com/rebing/graphql-laravel/pull/685)
+
 2020-11-13, 6.0.0-rc1
 ---------------------
-
 ## Breaking changes
 - Upgrade to webonyx/graphql-php 14.0.0 [\#645 / mfn](https://github.com/rebing/graphql-laravel/pull/645)
 - Remove support for Laravel < 6.0 [\#651 / mfn](https://github.com/rebing/graphql-laravel/pull/651)
@@ -15,9 +19,13 @@ CHANGELOG
 ### Added
 - Support for Laravel 8 [\#672 / mfn](https://github.com/rebing/graphql-laravel/pull/672)
 
+2020-11-26, 5.1.5
+-----------------
+### Fixed
+- Implemented generation of a SyntaxError instead of an hard Exception for empty single/batch queries [\#685 / plivius](https://github.com/rebing/graphql-laravel/pull/685)
+
 2020-11-16, 5.1.5-rc1
 ---------------------
-
 ### Added
 - Support for PHP 8 [\#686 / mfn](https://github.com/rebing/graphql-laravel/pull/686)
 

src/GraphQLController.php

@@ -45,7 +45,7 @@ public function query(Request $request, string $schema = null): JsonResponse
 
         // Complete each query in order
         foreach ($inputs as $input) {
-            $completedQueries[] = $this->executeQuery($schema, $input);
+            $completedQueries[] = $this->executeQuery($schema, $input ?: []);
         }
 
         $data = $isBatch ? $completedQueries : $completedQueries[0];
@@ -58,7 +58,7 @@ public function query(Request $request, string $schema = null): JsonResponse
 
     protected function executeQuery(string $schema, array $input): array
     {
-        $query = $input['query'];
+        $query = $input['query'] ?? '';
 
         $paramsKey = config('graphql.params_key', 'variables');
         $params = $input[$paramsKey] ?? null;

tests/Database/EmptyQueryTest.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rebing\GraphQL\Tests\Database;
+
+use Rebing\GraphQL\Tests\TestCaseDatabase;
+
+class EmptyQueryTest extends TestCaseDatabase
+{
+    /**
+     * @dataProvider dataForEmptyQuery
+     * @param array<mixed> $parameters
+     * @param bool $isBatchRequest
+     * @param bool $expectErrors
+     */
+    public function testEmptyQuery(array $parameters, bool $isBatchRequest, bool $expectErrors): void
+    {
+        $response = $this->call('GET', '/graphql', $parameters);
+
+        $this->assertSame(200, $response->getStatusCode());
+        $results = $isBatchRequest ? $response->getData(true) : [$response->getData(true)];
+
+        foreach ($results as $result) {
+            if ($expectErrors) {
+                $this->assertCount(1, $result['errors']);
+                $this->assertSame('Syntax Error: Unexpected <EOF>', $result['errors'][0]['message']);
+                $this->assertSame('graphql', $result['errors'][0]['extensions']['category']);
+            } else {
+                $this->assertArrayNotHasKey('errors', $result);
+            }
+        }
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    public function dataForEmptyQuery(): array
+    {
+        return [
+            // completely empty request
+            [
+                'parameters' => [],
+                'isBatchRequest' => false,
+                'expectErrors' => false,
+            ],
+            // single request with an empty query parameter
+            [
+                'parameters' => ['query' => null],
+                'isBatchRequest' => false,
+                'expectErrors' => true,
+            ],
+            [
+                'parameters' => ['query' => ''],
+                'isBatchRequest' => false,
+                'expectErrors' => true,
+            ],
+            [
+                'parameters' => ['query' => ' '],
+                'isBatchRequest' => false,
+                'expectErrors' => true,
+            ],
+            [
+                'parameters' => ['query' => '#'],
+                'isBatchRequest' => false,
+                'expectErrors' => true,
+            ],
+            // batch request with one completely empty batch, and batches with an empty query parameter
+            [
+                'parameters' => [[], ['query' => null], ['query' => ''], ['query' => ' '], ['query' => '#']],
+                'isBatchRequest' => true,
+                'expectErrors' => true,
+            ],
+        ];
+    }
+}