Merge branch 'master' into simplify-continue

# Conflicts: # src/Validator/Rules/UniqueDirectivesPerLocation.php
webonyx · Jan 24, 2022 · e771009 · e771009
2 parents 5dbbf64 + 9faf59a
commit e771009
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,7 +64,6 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Allow directives on variable definitions
 - Handle `null` parent of list in `ValuesOfCorrectType::getVisitor`
 - Allow sending both `query` and `queryId`, ignore `queryId` in that case
-- Fix `extend()` to preserve `repeatable` (#931)
 - Preserve extended methods from class-based types in `SchemaExtender::extend()`
 - Fix printing of empty types (#940)
 - Clone `NodeList` in `Node::cloneDeep()`
@@ -105,6 +104,18 @@ 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.5
+
+### Fixed
+
+- Fix `extend()` to preserve `repeatable` (#931)
+
+## 14.11.4
+
+### Fixed
+
+- Fix repeatable directive validation for AST
+
 ## 14.11.3
 
 ### Fixed

diff --git a/composer.json b/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",
@@ -43,9 +44,9 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "GraphQL\\Tests\\": "tests/",
       "GraphQL\\Benchmarks\\": "benchmarks/",
-      "GraphQL\\Examples\\Blog\\": "examples/01-blog/Blog/"
+      "GraphQL\\Examples\\Blog\\": "examples/01-blog/Blog/",
+      "GraphQL\\Tests\\": "tests/"
     }
   },
   "config": {

diff --git a/src/Validator/Rules/UniqueDirectivesPerLocation.php b/src/Validator/Rules/UniqueDirectivesPerLocation.php
@@ -36,20 +36,25 @@ 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) {
-                $uniqueDirectiveMap[$definition->name->value] = $definition->repeatable;
+            if ($definition instanceof DirectiveDefinitionNode
+                && ! $definition->repeatable
+            ) {
+                $uniqueDirectiveMap[$definition->name->value] = true;
             }
         }
 

diff --git a/tests/Validator/ValidatorTestCase.php b/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',