Fix validation of modified sparse ASTs (#1106)

Author: spawnia

.github/workflows/ci-build.yml

@@ -24,11 +24,12 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Install PHP
-      uses: shivammathur/setup-php@2.9.0
+      uses: shivammathur/setup-php@2.18.1
       with:
         php-version: ${{ matrix.php  }}
         coverage: none
         extensions: json, mbstring
+
     - name: Get Composer Cache Directory
       id: composer-cache
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 #### Unreleased
 
+#### 14.11.6
+
+Fixed:
+- Fix validation of modified sparse ASTs
+
 #### 14.11.5
 
 Fixed:

composer.json

@@ -37,7 +37,8 @@
     "sort-packages": true,
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true,
-      "phpstan/extension-installer": true
+      "phpstan/extension-installer": true,
+      "ergebnis/composer-normalize": true
     }
   },
   "autoload": {

phpstan-baseline.neon

@@ -580,11 +580,6 @@ parameters:
 			count: 1
 			path: src/Validator/ValidationContext.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, GraphQL\\\\Language\\\\AST\\\\SelectionSetNode\\|null given\\.$#"
-			count: 1
-			path: src/Validator/ValidationContext.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, array\\<GraphQL\\\\Language\\\\AST\\\\FragmentDefinitionNode\\> given\\.$#"
 			count: 1

src/Validator/ValidationContext.php

@@ -31,6 +31,7 @@
 use SplObjectStorage;
 use function array_merge;
 use function array_pop;
+use function assert;
 use function count;
 
 /**
@@ -180,16 +181,15 @@ public function getFragmentSpreads(HasSelectionSet $node) : array
             while (count($setsToVisit) > 0) {
                 $set = array_pop($setsToVisit);
 
-                for ($i = 0, $selectionCount = count($set->selections); $i < $selectionCount; $i++) {
-                    $selection = $set->selections[$i];
+                foreach ($set->selections as $selection) {
                     if ($selection instanceof FragmentSpreadNode) {
                         $spreads[] = $selection;
-                    } elseif ($selection instanceof FieldNode || $selection instanceof InlineFragmentNode) {
-                        if ($selection->selectionSet) {
-                            $setsToVisit[] = $selection->selectionSet;
-                        }
                     } else {
-                        throw InvariantViolation::shouldNotHappen();
+                        assert($selection instanceof FieldNode || $selection instanceof InlineFragmentNode);
+                        $selectionSet = $selection->selectionSet;
+                        if ($selectionSet !== null) {
+                            $setsToVisit[] = $selectionSet;
+                        }
                     }
                 }
             }