Fix repeatable directive validation for AST (#1055)

Author: spawnia

CHANGELOG.md

@@ -104,6 +104,12 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Remove parameter `$options` from `ASTDefinitionBuilder`
 - Remove `FieldDefinition::create()` in favor of `new FieldDefinition()`
 
+## 14.11.4
+
+### Fixed
+
+- Fix repeatable directive validation for AST
+
 ## 14.11.3
 
 ### Fixed

composer.json

@@ -18,6 +18,7 @@
     "dms/phpunit-arraysubset-asserts": "^0.3",
     "doctrine/coding-standard": "^9",
     "ergebnis/composer-normalize": "^2.16",
+    "friendsofphp/php-cs-fixer": "3.4.*",
     "mll-lab/php-cs-fixer-config": "^4.4",
     "nyholm/psr7": "^1.4",
     "phpbench/phpbench": "^1.2",

phpstan-baseline.neon

@@ -131,22 +131,22 @@ parameters:
 			path: src/Type/Definition/NonNull.php
 
 		-
-			message: "#^Array \\(array\\<string, GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type\\>\\) does not accept GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
+			message: "#^Generator expects value type GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type, GraphQL\\\\Type\\\\Definition\\\\Type given\\.$#"
 			count: 1
 			path: src/Type/Schema.php
 
 		-
-			message: "#^Generator expects value type GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type, GraphQL\\\\Type\\\\Definition\\\\Type given\\.$#"
+			message: "#^Method GraphQL\\\\Type\\\\Schema\\:\\:getType\\(\\) should return \\(GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type\\)\\|null but returns GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
 			count: 1
 			path: src/Type/Schema.php
 
 		-
-			message: "#^Method GraphQL\\\\Type\\\\Schema\\:\\:getType\\(\\) should return \\(GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type\\)\\|null but returns GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
+			message: "#^Method GraphQL\\\\Type\\\\Schema\\:\\:resolveType\\(\\) should return T of GraphQL\\\\Type\\\\Definition\\\\Type but returns \\(callable&GraphQL\\\\Type\\\\Definition\\\\Type\\)\\|T of GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
 			count: 1
 			path: src/Type/Schema.php
 
 		-
-			message: "#^Method GraphQL\\\\Type\\\\Schema\\:\\:resolveType\\(\\) should return T of GraphQL\\\\Type\\\\Definition\\\\Type but returns \\(callable&GraphQL\\\\Type\\\\Definition\\\\Type\\)\\|T of GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
+			message: "#^Property GraphQL\\\\Type\\\\Schema\\:\\:\\$resolvedTypes \\(array\\<string, GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type\\>\\) does not accept array\\<string, GraphQL\\\\Type\\\\Definition\\\\Type\\>\\.$#"
 			count: 1
 			path: src/Type/Schema.php
 

src/Utils/BuildClientSchema.php

@@ -112,6 +112,9 @@ public function buildSchema(): Schema
             }
 
             $name = $typeIntrospection['name'];
+            if (! is_string($name)) {
+                throw self::invalidOrIncompleteIntrospectionResult($typeIntrospection);
+            }
 
             // Use the built-in singleton types to avoid reconstruction
             $this->typeMap[$name] = $builtInTypes[$name]

src/Validator/Rules/UniqueDirectivesPerLocation.php

@@ -36,23 +36,26 @@ public function getSDLVisitor(SDLValidationContext $context): array
      */
     public function getASTVisitor(ASTValidationContext $context): array
     {
+        /** @var array<string, true> $uniqueDirectiveMap */
         $uniqueDirectiveMap = [];
 
         $schema = $context->getSchema();
         $definedDirectives = null !== $schema
             ? $schema->getDirectives()
             : Directive::getInternalDirectives();
         foreach ($definedDirectives as $directive) {
-            $uniqueDirectiveMap[$directive->name] = ! $directive->isRepeatable;
+            if (! $directive->isRepeatable) {
+                $uniqueDirectiveMap[$directive->name] = true;
+            }
         }
 
         $astDefinitions = $context->getDocument()->definitions;
         foreach ($astDefinitions as $definition) {
-            if (! ($definition instanceof DirectiveDefinitionNode)) {
-                continue;
+            if ($definition instanceof DirectiveDefinitionNode
+                && ! $definition->repeatable
+            ) {
+                $uniqueDirectiveMap[$definition->name->value] = true;
             }
-
-            $uniqueDirectiveMap[$definition->name->value] = $definition->repeatable;
         }
 
         return [

tests/Validator/ValidatorTestCase.php

@@ -373,15 +373,20 @@ public static function getTestSchema(): Schema
                 Directive::deprecatedDirective(),
                 new Directive([
                     'name' => 'directive',
-                    'locations' => [DirectiveLocation::FIELD],
+                    'locations' => [DirectiveLocation::FIELD, DirectiveLocation::FRAGMENT_DEFINITION],
                 ]),
                 new Directive([
                     'name' => 'directiveA',
-                    'locations' => [DirectiveLocation::FIELD],
+                    'locations' => [DirectiveLocation::FIELD, DirectiveLocation::FRAGMENT_DEFINITION],
                 ]),
                 new Directive([
                     'name' => 'directiveB',
-                    'locations' => [DirectiveLocation::FIELD],
+                    'locations' => [DirectiveLocation::FIELD, DirectiveLocation::FRAGMENT_DEFINITION],
+                ]),
+                new Directive([
+                    'name' => 'repeatable',
+                    'locations' => [DirectiveLocation::FIELD, DirectiveLocation::FRAGMENT_DEFINITION],
+                    'isRepeatable' => true,
                 ]),
                 new Directive([
                     'name' => 'onQuery',