From 5aad8b596b1c8c140aa6bc52b5c915f7db5f333c Mon Sep 17 00:00:00 2001 From: vladar Date: Sat, 19 Nov 2016 06:19:41 +0700 Subject: [PATCH] Consistent docblock comments for arrays --- src/Executor/ExecutionContext.php | 3 ++- src/Language/AST/FieldNode.php | 4 ++-- src/Language/AST/FragmentDefinitionNode.php | 2 +- src/Language/AST/FragmentSpreadNode.php | 2 +- src/Language/AST/InlineFragmentNode.php | 2 +- src/Language/AST/ListValueNode.php | 2 +- src/Language/AST/ObjectValueNode.php | 2 +- src/Language/AST/OperationDefinitionNode.php | 4 ++-- src/Language/AST/SelectionSetNode.php | 2 +- src/Language/Parser.php | 6 +++--- src/Schema.php | 2 +- src/Type/Definition/InterfaceType.php | 2 +- src/Type/Definition/ResolveInfo.php | 2 +- src/Type/Definition/UnionType.php | 2 +- src/Validator/Rules/OverlappingFieldsCanBeMerged.php | 6 ++++-- src/Validator/ValidationContext.php | 2 +- 16 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/Executor/ExecutionContext.php b/src/Executor/ExecutionContext.php index 1ae67e1..7619085 100644 --- a/src/Executor/ExecutionContext.php +++ b/src/Executor/ExecutionContext.php @@ -2,6 +2,7 @@ namespace GraphQL\Executor; use GraphQL\Error\Error; +use GraphQL\Language\AST\FragmentDefinitionNode; use GraphQL\Language\AST\OperationDefinitionNode; use GraphQL\Schema; @@ -19,7 +20,7 @@ class ExecutionContext public $schema; /** - * @var array + * @var FragmentDefinitionNode[] */ public $fragments; diff --git a/src/Language/AST/FieldNode.php b/src/Language/AST/FieldNode.php index 5a15d84..caf7cd4 100644 --- a/src/Language/AST/FieldNode.php +++ b/src/Language/AST/FieldNode.php @@ -16,12 +16,12 @@ class FieldNode extends Node implements SelectionNode public $alias; /** - * @var array|null + * @var ArgumentNode[]|null */ public $arguments; /** - * @var array|null + * @var DirectiveNode[]|null */ public $directives; diff --git a/src/Language/AST/FragmentDefinitionNode.php b/src/Language/AST/FragmentDefinitionNode.php index d9be11b..f3a02a2 100644 --- a/src/Language/AST/FragmentDefinitionNode.php +++ b/src/Language/AST/FragmentDefinitionNode.php @@ -16,7 +16,7 @@ class FragmentDefinitionNode extends Node implements DefinitionNode, HasSelectio public $typeCondition; /** - * @var array + * @var DirectiveNode[] */ public $directives; diff --git a/src/Language/AST/FragmentSpreadNode.php b/src/Language/AST/FragmentSpreadNode.php index a677400..44b9d76 100644 --- a/src/Language/AST/FragmentSpreadNode.php +++ b/src/Language/AST/FragmentSpreadNode.php @@ -11,7 +11,7 @@ class FragmentSpreadNode extends Node implements SelectionNode public $name; /** - * @var array + * @var DirectiveNode[] */ public $directives; } diff --git a/src/Language/AST/InlineFragmentNode.php b/src/Language/AST/InlineFragmentNode.php index 6430a32..d21aef3 100644 --- a/src/Language/AST/InlineFragmentNode.php +++ b/src/Language/AST/InlineFragmentNode.php @@ -11,7 +11,7 @@ class InlineFragmentNode extends Node implements SelectionNode public $typeCondition; /** - * @var array|null + * @var DirectiveNode[]|null */ public $directives; diff --git a/src/Language/AST/ListValueNode.php b/src/Language/AST/ListValueNode.php index e086c65..0c9690f 100644 --- a/src/Language/AST/ListValueNode.php +++ b/src/Language/AST/ListValueNode.php @@ -7,7 +7,7 @@ class ListValueNode extends Node implements ValueNode public $kind = NodeType::LST; /** - * @var array + * @var ValueNode[] */ public $values; } diff --git a/src/Language/AST/ObjectValueNode.php b/src/Language/AST/ObjectValueNode.php index 9eb5879..e91f8cc 100644 --- a/src/Language/AST/ObjectValueNode.php +++ b/src/Language/AST/ObjectValueNode.php @@ -6,7 +6,7 @@ class ObjectValueNode extends Node implements ValueNode public $kind = NodeType::OBJECT; /** - * @var array + * @var ObjectFieldNode[] */ public $fields; } diff --git a/src/Language/AST/OperationDefinitionNode.php b/src/Language/AST/OperationDefinitionNode.php index 5613ff6..01383d3 100644 --- a/src/Language/AST/OperationDefinitionNode.php +++ b/src/Language/AST/OperationDefinitionNode.php @@ -19,12 +19,12 @@ class OperationDefinitionNode extends Node implements DefinitionNode, HasSelecti public $operation; /** - * @var array + * @var VariableDefinitionNode[] */ public $variableDefinitions; /** - * @var array + * @var DirectiveNode[] */ public $directives; diff --git a/src/Language/AST/SelectionSetNode.php b/src/Language/AST/SelectionSetNode.php index 1adc478..f90d90d 100644 --- a/src/Language/AST/SelectionSetNode.php +++ b/src/Language/AST/SelectionSetNode.php @@ -6,7 +6,7 @@ class SelectionSetNode extends Node public $kind = NodeType::SELECTION_SET; /** - * @var array + * @var SelectionNode[] */ public $selections; } diff --git a/src/Language/Parser.php b/src/Language/Parser.php index 2ba9279..a793278 100644 --- a/src/Language/Parser.php +++ b/src/Language/Parser.php @@ -404,7 +404,7 @@ class Parser } /** - * @return array + * @return VariableDefinitionNode[] */ function parseVariableDefinitions() { @@ -507,7 +507,7 @@ class Parser } /** - * @return array + * @return ArgumentNode[] */ function parseArguments() { @@ -752,7 +752,7 @@ class Parser // Implements the parsing rules in the Directives section. /** - * @return array + * @return DirectiveNode[] */ function parseDirectives() { diff --git a/src/Schema.php b/src/Schema.php index 4002902..b08e14f 100644 --- a/src/Schema.php +++ b/src/Schema.php @@ -62,7 +62,7 @@ class Schema protected $directives; /** - * @var array + * @var Type[] */ protected $typeMap; diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php index dfe65f6..e44a18d 100644 --- a/src/Type/Definition/InterfaceType.php +++ b/src/Type/Definition/InterfaceType.php @@ -10,7 +10,7 @@ use GraphQL\Utils; class InterfaceType extends Type implements AbstractType, OutputType, CompositeType { /** - * @var array + * @var FieldDefinition[] */ private $fields; diff --git a/src/Type/Definition/ResolveInfo.php b/src/Type/Definition/ResolveInfo.php index c15b1e4..fae95bb 100644 --- a/src/Type/Definition/ResolveInfo.php +++ b/src/Type/Definition/ResolveInfo.php @@ -47,7 +47,7 @@ class ResolveInfo public $schema; /** - * @var array + * @var FragmentDefinitionNode[] */ public $fragments; diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php index a5b9c9f..7fce6bd 100644 --- a/src/Type/Definition/UnionType.php +++ b/src/Type/Definition/UnionType.php @@ -16,7 +16,7 @@ class UnionType extends Type implements AbstractType, OutputType, CompositeType private $types; /** - * @var array + * @var ObjectType[] */ private $possibleTypeNames; diff --git a/src/Validator/Rules/OverlappingFieldsCanBeMerged.php b/src/Validator/Rules/OverlappingFieldsCanBeMerged.php index 3869f24..22d29ee 100644 --- a/src/Validator/Rules/OverlappingFieldsCanBeMerged.php +++ b/src/Validator/Rules/OverlappingFieldsCanBeMerged.php @@ -3,6 +3,7 @@ namespace GraphQL\Validator\Rules; use GraphQL\Error\Error; +use GraphQL\Language\AST\ArgumentNode; use GraphQL\Language\AST\DirectiveNode; use GraphQL\Language\AST\FieldNode; use GraphQL\Language\AST\FragmentSpreadNode; @@ -373,8 +374,9 @@ class OverlappingFieldsCanBeMerged } /** - * @param Array $pairs1 - * @param Array $pairs2 + * @param ArgumentNode[]|DirectiveNode[] $arguments1 + * @param ArgumentNode[]|DirectiveNode[] $arguments2 + * * @return bool|string */ private function sameArguments(array $arguments1, array $arguments2) diff --git a/src/Validator/ValidationContext.php b/src/Validator/ValidationContext.php index c6f4d91..68d83ad 100644 --- a/src/Validator/ValidationContext.php +++ b/src/Validator/ValidationContext.php @@ -48,7 +48,7 @@ class ValidationContext private $errors; /** - * @var array + * @var FragmentDefinitionNode[] */ private $fragments;