Merge branch '0.11'

Author: mcg-web

src/Resolver/ResolverMap.php

@@ -18,7 +18,7 @@ abstract class ResolverMap implements ResolverMapInterface
     /**
      * Resolvers map.
      *
-     * @return callable[]
+     * @return array<string, callable[]>
      */
     abstract protected function map();
 

tests/Functional/Upload/UploadTest.php

@@ -6,6 +6,7 @@
 
 use GraphQL\Error\InvariantViolation;
 use Overblog\GraphQLBundle\Tests\Functional\TestCase;
+use Overblog\GraphQLBundle\Tests\VersionHelper;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class UploadTest extends TestCase
@@ -111,9 +112,12 @@ public function testSerializationIsUnsupported(): void
 
     public function testParseLiteralIsUnsupported(): void
     {
-        $this->expectException(InvariantViolation::class);
-        $this->expectExceptionMessage('Upload scalar literal unsupported.');
-        $this->uploadRequest(
+        $willThrowRawException = VersionHelper::compareWebonyxGraphQLPHPVersion('0.13.1', '<');
+        if ($willThrowRawException) {
+            $this->expectException(InvariantViolation::class);
+            $this->expectExceptionMessage('Upload scalar literal unsupported.');
+        }
+        $result = $this->uploadRequest(
             [
                 'operations' => [
                     'query' => 'mutation { singleUpload(file: {}) }',
@@ -123,6 +127,27 @@ public function testParseLiteralIsUnsupported(): void
             ],
             ['0' => 'a.txt']
         );
+        if (!$willThrowRawException) {
+            $this->assertEquals(
+                [
+                    'errors' => [
+                        [
+                            'message' => 'Field "singleUpload" argument "file" requires type Upload, found {}; GraphQLUpload scalar literal unsupported.',
+                            'extensions' => [
+                                'category' => 'graphql',
+                            ],
+                            'locations' => [
+                                [
+                                    'line' => 1,
+                                    'column' => 31,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                $result
+            );
+        }
     }
 
     private function assertUpload(array $expected, array $parameters, array $files, $uri = '/', $json = true): void