Simplify applied directives to DirectiveNode arrays only

spawnia · spawnia · commit 5a3c970e55f5 · 2026-02-14T20:08:54.000+01:00
diff --git a/src/Type/Definition/Argument.php b/src/Type/Definition/Argument.php
@@ -6,7 +6,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\InputValueDefinitionNode;
 use GraphQL\Type\Schema;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -17,7 +16,7 @@
  *     defaultValue?: mixed,
  *     description?: string|null,
  *     deprecationReason?: string|null,
- *     directives?: iterable<DirectiveNode>|null,
+ *     directives?: array<DirectiveNode>|null,
  *     astNode?: InputValueDefinitionNode|null
  * }
  * @phpstan-type ArgumentConfig array{
@@ -26,7 +25,7 @@
  *     defaultValue?: mixed,
  *     description?: string|null,
  *     deprecationReason?: string|null,
- *     directives?: iterable<DirectiveNode>|null,
+ *     directives?: array<DirectiveNode>|null,
  *     astNode?: InputValueDefinitionNode|null
  * }
  * @phpstan-type ArgumentListConfig iterable<ArgumentConfig|ArgumentType>|iterable<UnnamedArgumentConfig>
@@ -66,7 +65,7 @@ public function __construct(array $config)
         $this->deprecationReason = $config['deprecationReason'] ?? null;
         // Do nothing for type, it is lazy loaded in getType()
         $this->astNode = $config['astNode'] ?? null;
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/CustomScalarType.php b/src/Type/Definition/CustomScalarType.php
@@ -19,7 +19,7 @@
  *   serialize?: callable(mixed): mixed,
  *   parseValue: callable(mixed): mixed,
  *   parseLiteral: callable(ValueNode&Node, array<string, mixed>|null): mixed,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: ScalarTypeDefinitionNode|null,
  *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null
  * }
@@ -29,7 +29,7 @@
  *   serialize: callable(mixed): mixed,
  *   parseValue?: callable(mixed): mixed,
  *   parseLiteral?: callable(ValueNode&Node, array<string, mixed>|null): mixed,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: ScalarTypeDefinitionNode|null,
  *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null
  * }
diff --git a/src/Type/Definition/EnumType.php b/src/Type/Definition/EnumType.php
@@ -12,7 +12,6 @@
 use GraphQL\Language\AST\EnumValueNode;
 use GraphQL\Language\AST\Node;
 use GraphQL\Language\Printer;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\MixedStore;
 use GraphQL\Utils\Utils;
 
@@ -24,15 +23,15 @@
  *   value?: mixed,
  *   deprecationReason?: string|null,
  *   description?: string|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: EnumValueDefinitionNode|null
  * }
  * @phpstan-type EnumValues iterable<string, PartialEnumValueConfig>|iterable<string, mixed>|iterable<int, string>
  * @phpstan-type EnumTypeConfig array{
  *   name?: string|null,
  *   description?: string|null,
  *   values: EnumValues|callable(): EnumValues,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: EnumTypeDefinitionNode|null,
  *   extensionASTNodes?: array<EnumTypeExtensionNode>|null
  * }
@@ -80,7 +79,7 @@ public function __construct(array $config)
         $this->description = $config['description'] ?? null;
         $this->astNode = $config['astNode'] ?? null;
         $this->extensionASTNodes = $config['extensionASTNodes'] ?? [];
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/EnumValueDefinition.php b/src/Type/Definition/EnumValueDefinition.php
@@ -5,15 +5,14 @@
 use GraphQL\Error\InvariantViolation;
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\EnumValueDefinitionNode;
-use GraphQL\Utils\AppliedDirectives;
 
 /**
  * @phpstan-type EnumValueConfig array{
  *   name: string,
  *   value?: mixed,
  *   deprecationReason?: string|null,
  *   description?: string|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: EnumValueDefinitionNode|null
  * }
  */
@@ -48,7 +47,7 @@ public function __construct(array $config)
         $this->deprecationReason = $config['deprecationReason'] ?? null;
         $this->description = $config['description'] ?? null;
         $this->astNode = $config['astNode'] ?? null;
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/FieldDefinition.php b/src/Type/Definition/FieldDefinition.php
@@ -7,7 +7,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\FieldDefinitionNode;
 use GraphQL\Type\Schema;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -29,7 +28,7 @@
  *     description?: string|null,
  *     visible?: VisibilityFn|bool,
  *     deprecationReason?: string|null,
- *     directives?: iterable<DirectiveNode>|null,
+ *     directives?: array<DirectiveNode>|null,
  *     astNode?: FieldDefinitionNode|null,
  *     complexity?: ComplexityFn|null
  * }
@@ -41,7 +40,7 @@
  *     description?: string|null,
  *     visible?: VisibilityFn|bool,
  *     deprecationReason?: string|null,
- *     directives?: iterable<DirectiveNode>|null,
+ *     directives?: array<DirectiveNode>|null,
  *     astNode?: FieldDefinitionNode|null,
  *     complexity?: ComplexityFn|null
  * }
@@ -131,7 +130,7 @@ public function __construct(array $config)
         $this->visible = $config['visible'] ?? true;
         $this->deprecationReason = $config['deprecationReason'] ?? null;
         $this->astNode = $config['astNode'] ?? null;
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
         $this->complexityFn = $config['complexity'] ?? null;
 
         $this->config = $config;
diff --git a/src/Type/Definition/InputObjectField.php b/src/Type/Definition/InputObjectField.php
@@ -6,7 +6,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\InputValueDefinitionNode;
 use GraphQL\Type\Schema;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -17,7 +16,7 @@
  *   defaultValue?: mixed,
  *   description?: string|null,
  *   deprecationReason?: string|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: InputValueDefinitionNode|null
  * }
  * @phpstan-type UnnamedInputObjectFieldConfig array{
@@ -26,7 +25,7 @@
  *   defaultValue?: mixed,
  *   description?: string|null,
  *   deprecationReason?: string|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: InputValueDefinitionNode|null
  * }
  */
@@ -65,7 +64,7 @@ public function __construct(array $config)
         $this->deprecationReason = $config['deprecationReason'] ?? null;
         // Do nothing for type, it is lazy loaded in getType()
         $this->astNode = $config['astNode'] ?? null;
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php
@@ -7,7 +7,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\InputObjectTypeDefinitionNode;
 use GraphQL\Language\AST\InputObjectTypeExtensionNode;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -23,7 +22,7 @@
  *   isOneOf?: bool|null,
  *   fields: iterable<FieldConfig>|callable(): iterable<FieldConfig>,
  *   parseValue?: ParseValueFn|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: InputObjectTypeDefinitionNode|null,
  *   extensionASTNodes?: array<InputObjectTypeExtensionNode>|null
  * }
@@ -69,7 +68,7 @@ public function __construct(array $config)
         $this->parseValue = $config['parseValue'] ?? null;
         $this->astNode = $config['astNode'] ?? null;
         $this->extensionASTNodes = $config['extensionASTNodes'] ?? [];
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php
@@ -7,7 +7,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\InterfaceTypeDefinitionNode;
 use GraphQL\Language\AST\InterfaceTypeExtensionNode;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -23,7 +22,7 @@
  *   interfaces?: iterable<InterfaceTypeReference>|callable(): iterable<InterfaceTypeReference>,
  *   resolveType?: ResolveType|null,
  *   resolveValue?: ResolveValue|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: InterfaceTypeDefinitionNode|null,
  *   extensionASTNodes?: array<InterfaceTypeExtensionNode>|null
  * }
@@ -56,7 +55,7 @@ public function __construct(array $config)
         $this->description = $config['description'] ?? null;
         $this->astNode = $config['astNode'] ?? null;
         $this->extensionASTNodes = $config['extensionASTNodes'] ?? [];
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/ObjectType.php b/src/Type/Definition/ObjectType.php
@@ -9,7 +9,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\ObjectTypeDefinitionNode;
 use GraphQL\Language\AST\ObjectTypeExtensionNode;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -59,7 +58,7 @@
  *   fields: (callable(): iterable<mixed>)|iterable<mixed>,
  *   interfaces?: iterable<InterfaceTypeReference>|callable(): iterable<InterfaceTypeReference>,
  *   isTypeOf?: (callable(mixed $objectValue, mixed $context, ResolveInfo $resolveInfo): (bool|Deferred|null))|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: ObjectTypeDefinitionNode|null,
  *   extensionASTNodes?: array<ObjectTypeExtensionNode>|null
  * }
@@ -108,7 +107,7 @@ public function __construct(array $config)
         $this->argsMapper = $config['argsMapper'] ?? null;
         $this->astNode = $config['astNode'] ?? null;
         $this->extensionASTNodes = $config['extensionASTNodes'] ?? [];
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/ScalarType.php b/src/Type/Definition/ScalarType.php
@@ -6,7 +6,6 @@
 use GraphQL\Language\AST\DirectiveNode;
 use GraphQL\Language\AST\ScalarTypeDefinitionNode;
 use GraphQL\Language\AST\ScalarTypeExtensionNode;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -30,7 +29,7 @@
  * @phpstan-type ScalarConfig array{
  *   name?: string|null,
  *   description?: string|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: ScalarTypeDefinitionNode|null,
  *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null
  * }
@@ -61,7 +60,7 @@ public function __construct(array $config = [])
         $this->description = $config['description'] ?? $this->description ?? null;
         $this->astNode = $config['astNode'] ?? null;
         $this->extensionASTNodes = $config['extensionASTNodes'] ?? [];
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php
@@ -7,7 +7,6 @@
 use GraphQL\Language\AST\UnionTypeDefinitionNode;
 use GraphQL\Language\AST\UnionTypeExtensionNode;
 use GraphQL\Type\Schema;
-use GraphQL\Utils\AppliedDirectives;
 use GraphQL\Utils\Utils;
 
 /**
@@ -21,7 +20,7 @@
  *   types: iterable<ObjectTypeReference>|callable(): iterable<ObjectTypeReference>,
  *   resolveType?: ResolveType|null,
  *   resolveValue?: ResolveValue|null,
- *   directives?: iterable<DirectiveNode>|null,
+ *   directives?: array<DirectiveNode>|null,
  *   astNode?: UnionTypeDefinitionNode|null,
  *   extensionASTNodes?: array<UnionTypeExtensionNode>|null
  * }
@@ -66,7 +65,7 @@ public function __construct(array $config)
         $this->description = $config['description'] ?? $this->description ?? null;
         $this->astNode = $config['astNode'] ?? null;
         $this->extensionASTNodes = $config['extensionASTNodes'] ?? [];
-        $this->directives = AppliedDirectives::normalize($config['directives'] ?? null);
+        $this->directives = $config['directives'] ?? [];
 
         $this->config = $config;
     }
diff --git a/src/Type/SchemaConfig.php b/src/Type/SchemaConfig.php
@@ -10,7 +10,6 @@
 use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
-use GraphQL\Utils\AppliedDirectives;
 
 /**
  * Configuration options for schema construction.
@@ -38,7 +37,7 @@
  *   subscription?: MaybeLazyObjectType,
  *   types?: Types|null,
  *   directives?: array<Directive>|null,
- *   schemaDirectives?: iterable<DirectiveNode>|null,
+ *   schemaDirectives?: array<DirectiveNode>|null,
  *   typeLoader?: TypeLoader|null,
  *   assumeValid?: bool|null,
  *   astNode?: SchemaDefinitionNode|null,
@@ -295,15 +294,13 @@ public function getSchemaDirectives(): array
     }
 
     /**
-     * @param iterable<DirectiveNode>|null $directives
-     *
-     * @throws InvariantViolation
+     * @param array<DirectiveNode>|null $directives
      *
      * @api
      */
-    public function setSchemaDirectives(?iterable $directives): self
+    public function setSchemaDirectives(?array $directives): self
     {
-        $this->schemaDirectives = AppliedDirectives::normalize($directives);
+        $this->schemaDirectives = $directives ?? [];
 
         return $this;
     }
diff --git a/src/Utils/AppliedDirectives.php b/src/Utils/AppliedDirectives.php
