Fix overly eager validation of repeatable directive usage (#847)

Author: spawnia

CHANGELOG.md

@@ -1,11 +1,19 @@
 # Changelog
 
 #### Unreleased
+Changed:
 - PHP version required: 7.4+
+
+Removed:
 - Removed deprecated `Type::getInternalTypes()`
 - Remove deprecated `GraphQL::execute()`
 - Remove deprecated `GraphQL::executeAndReturnResult()`
 
+#### 14.6.2
+
+Fix:
+- Fix overly eager validation of repeatable directive usage
+
 #### 14.6.1
 
 Fix:

src/Type/SchemaValidationContext.php

@@ -62,13 +62,11 @@
 class SchemaValidationContext
 {
     /** @var array<int, Error> */
-    private $errors = [];
+    private array $errors = [];
 
-    /** @var Schema */
-    private $schema;
+    private Schema $schema;
 
-    /** @var InputObjectCircularRefs */
-    private $inputObjectCircularRefs;
+    private InputObjectCircularRefs $inputObjectCircularRefs;
 
     public function __construct(Schema $schema)
     {
@@ -381,8 +379,9 @@ public function validateTypes(): void
      */
     private function validateDirectivesAtLocation(NodeList $directives, string $location)
     {
-        $directivesNamed = [];
-        $schema          = $this->schema;
+        /** @var array<string, array<int, DirectiveNode>> $potentiallyDuplicateDirectives */
+        $potentiallyDuplicateDirectives = [];
+        $schema                         = $this->schema;
         foreach ($directives as $directive) {
             $directiveName = $directive->name->value;
 
@@ -412,18 +411,22 @@ static function ($schemaLocation) use ($location): bool {
                 );
             }
 
-            $existingNodes                   = $directivesNamed[$directiveName] ?? [];
-            $existingNodes[]                 = $directive;
-            $directivesNamed[$directiveName] = $existingNodes;
+            if ($schemaDirective->isRepeatable) {
+                continue;
+            }
+
+            $existingNodes                                  = $potentiallyDuplicateDirectives[$directiveName] ?? [];
+            $existingNodes[]                                = $directive;
+            $potentiallyDuplicateDirectives[$directiveName] = $existingNodes;
         }
 
-        foreach ($directivesNamed as $directiveName => $directiveList) {
+        foreach ($potentiallyDuplicateDirectives as $directiveName => $directiveList) {
             if (count($directiveList) <= 1) {
                 continue;
             }
 
             $this->reportError(
-                sprintf('Directive @%s used twice at the same location.', $directiveName),
+                sprintf('Non-repeatable directive @%s used more than once at the same location.', $directiveName),
                 $directiveList
             );
         }