Merge pull request #24 from x-graphql/fix/skip-null-variable-when-del…

…egating-query fix: skip null variable when delegating query
x-graphql · Apr 25, 2024 · baa82e6 · baa82e6
2 parents 52c0e99 + b2635c8
commit baa82e6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/Execution/DelegateResolver.php b/src/Execution/DelegateResolver.php
@@ -329,7 +329,7 @@ private function collectVariables(OperationDefinitionNode $operation, array $fra
         ];
 
         foreach ($names as $name) {
-            if (isset($this->variables[$name])) {
+            if (array_key_exists($name, $this->variables)) {
                 $variables[$name] = $this->variables[$name];
             }
         }

diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -427,6 +427,25 @@ public static function executionProvider(): array
                     ]
                 ]
             ],
+            'use null variable' => [
+                <<<'GQL'
+query($code: ID) {
+  findPersonByLanguageCode(code: $code) {
+    name
+  }
+}
+GQL,
+                [
+                    'code' => null
+                ],
+                [
+                    'data' => [
+                        'findPersonByLanguageCode' => [
+                            'name' => 'John Doe unknown',
+                        ]
+                    ]
+                ],
+            ]
         ];
     }
 
@@ -593,10 +612,10 @@ private function createLocalSchema(): Schema
                     'findPersonByLanguageCode' => [
                         'type' => $personType,
                         'args' => [
-                            'code' => Type::nonNull(Type::id()),
+                            'code' => Type::id(),
                         ],
                         'resolve' => fn (mixed $rootValue, array $args) => [
-                            'name' => 'John Doe ' . $args['code'],
+                            'name' => 'John Doe ' . ($args['code'] ?? 'unknown'),
                             'languages' => (array)$args['code'],
                         ],
                     ]