ResolveInfo: Take in account inline fragments in getFieldSelection()

webonyx · Mar 10, 2017 · f77bd17 · f77bd17
1 parent 827bfa7
commit f77bd17
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Type/Definition/ResolveInfo.php b/src/Type/Definition/ResolveInfo.php
@@ -5,8 +5,8 @@
 use GraphQL\Language\AST\FieldNode;
 use GraphQL\Language\AST\FragmentDefinitionNode;
 use GraphQL\Language\AST\FragmentSpreadNode;
+use GraphQL\Language\AST\InlineFragmentNode;
 use GraphQL\Language\AST\OperationDefinitionNode;
-use GraphQL\Language\AST\SelectionNode;
 use GraphQL\Language\AST\SelectionSetNode;
 use GraphQL\Schema;
 use GraphQL\Utils;
@@ -138,6 +138,8 @@ private function foldSelectionSet(SelectionSetNode $selectionSet, $descend)
                     $fragment = $this->fragments[$spreadName];
                     $fields += $this->foldSelectionSet($fragment->selectionSet, $descend);
                 }
+            } else if ($selectionNode instanceof InlineFragmentNode) {
+                $fields += $this->foldSelectionSet($selectionNode->selectionSet, $descend);
             }
         }
 

diff --git a/tests/Type/ResolveInfoTest.php b/tests/Type/ResolveInfoTest.php
@@ -71,6 +71,7 @@ public function testFieldSelection()
             image {
                 width
                 height
+                ...MyImage
             }
             replies {
                 body
@@ -80,6 +81,9 @@ public function testFieldSelection()
                     pic {
                         url
                         width
+                        ... on Image {
+                            height
+                        }
                     }
                     recentArticle {
                         id
@@ -90,6 +94,9 @@ public function testFieldSelection()
             }
         }
       }
+      fragment MyImage on Image {
+        url
+      }
 ';
         $expectedDefaultSelection = [
             'author' => true,
@@ -106,7 +113,8 @@ public function testFieldSelection()
             ],
             'image' => [
                 'width' => true,
-                'height' => true
+                'height' => true,
+                'url' => true
             ],
             'replies' => [
                 'body' => true,
@@ -115,7 +123,8 @@ public function testFieldSelection()
                     'name' => true,
                     'pic' => [
                         'url' => true,
-                        'width' => true
+                        'width' => true,
+                        'height' => true
                     ],
                     'recentArticle' => [
                         'id' => true,