Merge selected fields in ResolveInfo::getFieldSelection()

Author: jacor84

src/Type/Definition/ResolveInfo.php

@@ -227,7 +227,10 @@ private function foldSelectionSet(SelectionSetNode $selectionSet, int $descend):
         foreach ($selectionSet->selections as $selectionNode) {
             if ($selectionNode instanceof FieldNode) {
                 $fields[$selectionNode->name->value] = $descend > 0 && $selectionNode->selectionSet !== null
-                    ? $this->foldSelectionSet($selectionNode->selectionSet, $descend - 1)
+                    ? \array_merge_recursive(
+                      $fields[$selectionNode->name->value] ?? [],
+                      $this->foldSelectionSet($selectionNode->selectionSet, $descend - 1)
+                    )
                     : true;
             } elseif ($selectionNode instanceof FragmentSpreadNode) {
                 $spreadName = $selectionNode->name->value;

tests/Type/ResolveInfoTest.php

@@ -276,14 +276,14 @@ public function testMergedFragmentsFieldSelection(): void
       fragment MyImage on Image {
         url
       }
-      
+
       fragment Replies01 on Article {
         _replies012: replies {
             body
         }
       }
       fragment Replies02 on Article {
-        _replies012: replies {            
+        _replies012: replies {
             author {
                 id
                 name
@@ -369,4 +369,80 @@ public function testMergedFragmentsFieldSelection(): void
         self::assertEquals(['data' => ['article' => null]], $result);
         self::assertEquals($expectedDeepSelection, $actualDeepSelection);
     }
+
+    public function testDeepFieldSelectionOnDuplicatedFields(): void
+    {
+      $level2 = new ObjectType([
+          'name' => 'level2',
+          'fields' => [
+              'scalar1' => ['type' => Type::int()],
+              'scalar2' => ['type' => Type::int()],
+          ],
+      ]);
+      $level1 = new ObjectType([
+          'name' => 'level1',
+          'fields' => [
+              'scalar1' => ['type' => Type::int()],
+              'scalar2' => ['type' => Type::int()],
+              'level2' => $level2,
+          ],
+      ]);
+
+      $hasCalled = false;
+      $actualDeepSelection = null;
+
+      $query = new ObjectType([
+          'name' => 'Query',
+          'fields' => [
+              'level1' => [
+                  'type' => $level1,
+                  'resolve' => static function (
+                      $value,
+                      array $args,
+                      $context,
+                      ResolveInfo $info
+                  ) use (
+                      &$hasCalled,
+                      &$actualDeepSelection
+                  ) {
+                      $hasCalled = true;
+                      $actualDeepSelection = $info->getFieldSelection(2);
+
+                      return null;
+                  },
+              ],
+          ],
+      ]);
+
+      $doc = '
+        query deepMerge {
+          level1 {
+            level2 {
+              scalar1
+            }
+            level2 {
+              scalar2
+            }
+            scalar1
+            scalar2
+          }
+        }
+      ';
+
+      $expectedDeepSelection = [
+          'level2' => [
+              'scalar1' => true,
+              'scalar2' => true,
+          ],
+          'scalar1' => true,
+          'scalar2' => true,
+      ];
+
+      $schema = new Schema(['query' => $query]);
+      $result = GraphQL::executeQuery($schema, $doc)->toArray();
+
+      self::assertTrue($hasCalled);
+      self::assertEquals(['data' => ['level1' => null]], $result);
+      self::assertEquals($expectedDeepSelection, $actualDeepSelection);
+    }
 }