diff --git a/src/Error/Warning.php b/src/Error/Warning.php index 65ee819..16add8b 100644 --- a/src/Error/Warning.php +++ b/src/Error/Warning.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace GraphQL\Error; -use const E_USER_WARNING; use function trigger_error; +use const E_USER_WARNING; /** * Encapsulates warnings produced by the library. diff --git a/src/Language/AST/ArgumentNode.php b/src/Language/AST/ArgumentNode.php index 1519429..545a855 100644 --- a/src/Language/AST/ArgumentNode.php +++ b/src/Language/AST/ArgumentNode.php @@ -14,6 +14,4 @@ class ArgumentNode extends Node /** @var NameNode */ public $name; - - } diff --git a/src/Language/AST/BooleanValueNode.php b/src/Language/AST/BooleanValueNode.php index 43ba1c0..246fe35 100644 --- a/src/Language/AST/BooleanValueNode.php +++ b/src/Language/AST/BooleanValueNode.php @@ -11,5 +11,4 @@ class BooleanValueNode extends Node implements ValueNode /** @var string */ public $value; - } diff --git a/src/Language/AST/DirectiveDefinitionNode.php b/src/Language/AST/DirectiveDefinitionNode.php index d2e85a4..825c7f7 100644 --- a/src/Language/AST/DirectiveDefinitionNode.php +++ b/src/Language/AST/DirectiveDefinitionNode.php @@ -20,5 +20,4 @@ class DirectiveDefinitionNode extends Node implements TypeSystemDefinitionNode /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/DirectiveNode.php b/src/Language/AST/DirectiveNode.php index a2246d0..09de366 100644 --- a/src/Language/AST/DirectiveNode.php +++ b/src/Language/AST/DirectiveNode.php @@ -14,5 +14,4 @@ class DirectiveNode extends Node /** @var ArgumentNode[] */ public $arguments; - } diff --git a/src/Language/AST/DocumentNode.php b/src/Language/AST/DocumentNode.php index 4749444..3b41868 100644 --- a/src/Language/AST/DocumentNode.php +++ b/src/Language/AST/DocumentNode.php @@ -11,5 +11,4 @@ class DocumentNode extends Node /** @var DefinitionNode[] */ public $definitions; - } diff --git a/src/Language/AST/EnumTypeDefinitionNode.php b/src/Language/AST/EnumTypeDefinitionNode.php index ca35ecb..f21ae83 100644 --- a/src/Language/AST/EnumTypeDefinitionNode.php +++ b/src/Language/AST/EnumTypeDefinitionNode.php @@ -20,6 +20,4 @@ class EnumTypeDefinitionNode extends Node implements TypeDefinitionNode /** @var StringValueNode|null */ public $description; - - } diff --git a/src/Language/AST/EnumTypeExtensionNode.php b/src/Language/AST/EnumTypeExtensionNode.php index 15d519e..7812abc 100644 --- a/src/Language/AST/EnumTypeExtensionNode.php +++ b/src/Language/AST/EnumTypeExtensionNode.php @@ -17,5 +17,4 @@ class EnumTypeExtensionNode extends Node implements TypeExtensionNode /** @var EnumValueDefinitionNode[]|null */ public $values; - } diff --git a/src/Language/AST/EnumValueDefinitionNode.php b/src/Language/AST/EnumValueDefinitionNode.php index f2621bf..1eff6c2 100644 --- a/src/Language/AST/EnumValueDefinitionNode.php +++ b/src/Language/AST/EnumValueDefinitionNode.php @@ -17,5 +17,4 @@ class EnumValueDefinitionNode extends Node /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/EnumValueNode.php b/src/Language/AST/EnumValueNode.php index 7b4f341..1325bc4 100644 --- a/src/Language/AST/EnumValueNode.php +++ b/src/Language/AST/EnumValueNode.php @@ -11,5 +11,4 @@ class EnumValueNode extends Node implements ValueNode /** @var string */ public $value; - } diff --git a/src/Language/AST/FieldDefinitionNode.php b/src/Language/AST/FieldDefinitionNode.php index e010310..9e48f19 100644 --- a/src/Language/AST/FieldDefinitionNode.php +++ b/src/Language/AST/FieldDefinitionNode.php @@ -23,5 +23,4 @@ class FieldDefinitionNode extends Node /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/FieldNode.php b/src/Language/AST/FieldNode.php index 1ea1674..e3c4125 100644 --- a/src/Language/AST/FieldNode.php +++ b/src/Language/AST/FieldNode.php @@ -23,5 +23,4 @@ class FieldNode extends Node implements SelectionNode /** @var SelectionSetNode|null */ public $selectionSet; - } diff --git a/src/Language/AST/FloatValueNode.php b/src/Language/AST/FloatValueNode.php index 9bbf54a..b02f5b4 100644 --- a/src/Language/AST/FloatValueNode.php +++ b/src/Language/AST/FloatValueNode.php @@ -11,5 +11,4 @@ class FloatValueNode extends Node implements ValueNode /** @var string */ public $value; - } diff --git a/src/Language/AST/FragmentDefinitionNode.php b/src/Language/AST/FragmentDefinitionNode.php index 42b47f4..5c53e4a 100644 --- a/src/Language/AST/FragmentDefinitionNode.php +++ b/src/Language/AST/FragmentDefinitionNode.php @@ -28,6 +28,4 @@ class FragmentDefinitionNode extends Node implements ExecutableDefinitionNode, H /** @var SelectionSetNode */ public $selectionSet; - - } diff --git a/src/Language/AST/FragmentSpreadNode.php b/src/Language/AST/FragmentSpreadNode.php index cbaf803..f6ca72c 100644 --- a/src/Language/AST/FragmentSpreadNode.php +++ b/src/Language/AST/FragmentSpreadNode.php @@ -14,5 +14,4 @@ class FragmentSpreadNode extends Node implements SelectionNode /** @var DirectiveNode[] */ public $directives; - } diff --git a/src/Language/AST/InlineFragmentNode.php b/src/Language/AST/InlineFragmentNode.php index 93ac2f0..fe22008 100644 --- a/src/Language/AST/InlineFragmentNode.php +++ b/src/Language/AST/InlineFragmentNode.php @@ -17,5 +17,4 @@ class InlineFragmentNode extends Node implements SelectionNode /** @var SelectionSetNode */ public $selectionSet; - } diff --git a/src/Language/AST/InputObjectTypeDefinitionNode.php b/src/Language/AST/InputObjectTypeDefinitionNode.php index dfaad32..f761e1f 100644 --- a/src/Language/AST/InputObjectTypeDefinitionNode.php +++ b/src/Language/AST/InputObjectTypeDefinitionNode.php @@ -20,5 +20,4 @@ class InputObjectTypeDefinitionNode extends Node implements TypeDefinitionNode /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/InputObjectTypeExtensionNode.php b/src/Language/AST/InputObjectTypeExtensionNode.php index fa9fc9e..b9ee90b 100644 --- a/src/Language/AST/InputObjectTypeExtensionNode.php +++ b/src/Language/AST/InputObjectTypeExtensionNode.php @@ -17,5 +17,4 @@ class InputObjectTypeExtensionNode extends Node implements TypeExtensionNode /** @var InputValueDefinitionNode[]|null */ public $fields; - } diff --git a/src/Language/AST/InputValueDefinitionNode.php b/src/Language/AST/InputValueDefinitionNode.php index 48097e9..afbaabb 100644 --- a/src/Language/AST/InputValueDefinitionNode.php +++ b/src/Language/AST/InputValueDefinitionNode.php @@ -23,5 +23,4 @@ class InputValueDefinitionNode extends Node /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/IntValueNode.php b/src/Language/AST/IntValueNode.php index 03eee41..3441b7b 100644 --- a/src/Language/AST/IntValueNode.php +++ b/src/Language/AST/IntValueNode.php @@ -11,5 +11,4 @@ class IntValueNode extends Node implements ValueNode /** @var string */ public $value; - } diff --git a/src/Language/AST/InterfaceTypeDefinitionNode.php b/src/Language/AST/InterfaceTypeDefinitionNode.php index cffdc58..b14bd7a 100644 --- a/src/Language/AST/InterfaceTypeDefinitionNode.php +++ b/src/Language/AST/InterfaceTypeDefinitionNode.php @@ -20,5 +20,4 @@ class InterfaceTypeDefinitionNode extends Node implements TypeDefinitionNode /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/InterfaceTypeExtensionNode.php b/src/Language/AST/InterfaceTypeExtensionNode.php index 1907bb3..9528f3d 100644 --- a/src/Language/AST/InterfaceTypeExtensionNode.php +++ b/src/Language/AST/InterfaceTypeExtensionNode.php @@ -17,5 +17,4 @@ class InterfaceTypeExtensionNode extends Node implements TypeExtensionNode /** @var FieldDefinitionNode[]|null */ public $fields; - } diff --git a/src/Language/AST/ListTypeNode.php b/src/Language/AST/ListTypeNode.php index f29d9ad..104810a 100644 --- a/src/Language/AST/ListTypeNode.php +++ b/src/Language/AST/ListTypeNode.php @@ -11,5 +11,4 @@ class ListTypeNode extends Node implements TypeNode /** @var Node */ public $type; - } diff --git a/src/Language/AST/ListValueNode.php b/src/Language/AST/ListValueNode.php index 420d2ac..3720c85 100644 --- a/src/Language/AST/ListValueNode.php +++ b/src/Language/AST/ListValueNode.php @@ -11,5 +11,4 @@ class ListValueNode extends Node implements ValueNode /** @var ValueNode[]|NodeList */ public $values; - } diff --git a/src/Language/AST/NameNode.php b/src/Language/AST/NameNode.php index 91f6d05..ad91196 100644 --- a/src/Language/AST/NameNode.php +++ b/src/Language/AST/NameNode.php @@ -11,5 +11,4 @@ class NameNode extends Node implements TypeNode /** @var string */ public $value; - } diff --git a/src/Language/AST/NamedTypeNode.php b/src/Language/AST/NamedTypeNode.php index e43f7b3..7a44b2f 100644 --- a/src/Language/AST/NamedTypeNode.php +++ b/src/Language/AST/NamedTypeNode.php @@ -11,5 +11,4 @@ class NamedTypeNode extends Node implements TypeNode /** @var NameNode */ public $name; - } diff --git a/src/Language/AST/NonNullTypeNode.php b/src/Language/AST/NonNullTypeNode.php index da0ce3d..f8b97c0 100644 --- a/src/Language/AST/NonNullTypeNode.php +++ b/src/Language/AST/NonNullTypeNode.php @@ -11,5 +11,4 @@ class NonNullTypeNode extends Node implements TypeNode /** @var NameNode | ListTypeNode */ public $type; - } diff --git a/src/Language/AST/NullValueNode.php b/src/Language/AST/NullValueNode.php index ef11f45..7881e2f 100644 --- a/src/Language/AST/NullValueNode.php +++ b/src/Language/AST/NullValueNode.php @@ -8,5 +8,4 @@ class NullValueNode extends Node implements ValueNode { /** @var string */ public $kind = NodeKind::NULL; - } diff --git a/src/Language/AST/ObjectFieldNode.php b/src/Language/AST/ObjectFieldNode.php index 45ab8c8..cd458e8 100644 --- a/src/Language/AST/ObjectFieldNode.php +++ b/src/Language/AST/ObjectFieldNode.php @@ -14,5 +14,4 @@ class ObjectFieldNode extends Node /** @var ValueNode */ public $value; - } diff --git a/src/Language/AST/ObjectTypeDefinitionNode.php b/src/Language/AST/ObjectTypeDefinitionNode.php index 8a8d4ca..0339c35 100644 --- a/src/Language/AST/ObjectTypeDefinitionNode.php +++ b/src/Language/AST/ObjectTypeDefinitionNode.php @@ -23,6 +23,4 @@ class ObjectTypeDefinitionNode extends Node implements TypeDefinitionNode /** @var StringValueNode|null */ public $description; - - } diff --git a/src/Language/AST/ObjectTypeExtensionNode.php b/src/Language/AST/ObjectTypeExtensionNode.php index 336bae6..4522449 100644 --- a/src/Language/AST/ObjectTypeExtensionNode.php +++ b/src/Language/AST/ObjectTypeExtensionNode.php @@ -20,5 +20,4 @@ class ObjectTypeExtensionNode extends Node implements TypeExtensionNode /** @var FieldDefinitionNode[] */ public $fields; - } diff --git a/src/Language/AST/ObjectValueNode.php b/src/Language/AST/ObjectValueNode.php index 8347fc8..7e0d71c 100644 --- a/src/Language/AST/ObjectValueNode.php +++ b/src/Language/AST/ObjectValueNode.php @@ -11,5 +11,4 @@ class ObjectValueNode extends Node implements ValueNode /** @var ObjectFieldNode[]|NodeList */ public $fields; - } diff --git a/src/Language/AST/OperationDefinitionNode.php b/src/Language/AST/OperationDefinitionNode.php index 84ad975..cef0053 100644 --- a/src/Language/AST/OperationDefinitionNode.php +++ b/src/Language/AST/OperationDefinitionNode.php @@ -23,5 +23,4 @@ class OperationDefinitionNode extends Node implements ExecutableDefinitionNode, /** @var SelectionSetNode */ public $selectionSet; - } diff --git a/src/Language/AST/OperationTypeDefinitionNode.php b/src/Language/AST/OperationTypeDefinitionNode.php index 3b1b454..9ad8d25 100644 --- a/src/Language/AST/OperationTypeDefinitionNode.php +++ b/src/Language/AST/OperationTypeDefinitionNode.php @@ -18,5 +18,4 @@ class OperationTypeDefinitionNode extends Node /** @var NamedTypeNode */ public $type; - } diff --git a/src/Language/AST/ScalarTypeDefinitionNode.php b/src/Language/AST/ScalarTypeDefinitionNode.php index f99702c..5c90662 100644 --- a/src/Language/AST/ScalarTypeDefinitionNode.php +++ b/src/Language/AST/ScalarTypeDefinitionNode.php @@ -17,5 +17,4 @@ class ScalarTypeDefinitionNode extends Node implements TypeDefinitionNode /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/ScalarTypeExtensionNode.php b/src/Language/AST/ScalarTypeExtensionNode.php index 014e1ab..fe88316 100644 --- a/src/Language/AST/ScalarTypeExtensionNode.php +++ b/src/Language/AST/ScalarTypeExtensionNode.php @@ -14,5 +14,4 @@ class ScalarTypeExtensionNode extends Node implements TypeExtensionNode /** @var DirectiveNode[]|null */ public $directives; - } diff --git a/src/Language/AST/SchemaDefinitionNode.php b/src/Language/AST/SchemaDefinitionNode.php index cb5ec4e..20e6a89 100644 --- a/src/Language/AST/SchemaDefinitionNode.php +++ b/src/Language/AST/SchemaDefinitionNode.php @@ -14,5 +14,4 @@ class SchemaDefinitionNode extends Node implements TypeSystemDefinitionNode /** @var OperationTypeDefinitionNode[] */ public $operationTypes; - } diff --git a/src/Language/AST/SelectionSetNode.php b/src/Language/AST/SelectionSetNode.php index 31a323c..427674e 100644 --- a/src/Language/AST/SelectionSetNode.php +++ b/src/Language/AST/SelectionSetNode.php @@ -11,5 +11,4 @@ class SelectionSetNode extends Node /** @var SelectionNode[] */ public $selections; - } diff --git a/src/Language/AST/StringValueNode.php b/src/Language/AST/StringValueNode.php index 8bfad40..b1fe0df 100644 --- a/src/Language/AST/StringValueNode.php +++ b/src/Language/AST/StringValueNode.php @@ -14,5 +14,4 @@ class StringValueNode extends Node implements ValueNode /** @var bool|null */ public $block; - } diff --git a/src/Language/AST/UnionTypeDefinitionNode.php b/src/Language/AST/UnionTypeDefinitionNode.php index 3320ce3..1bfef69 100644 --- a/src/Language/AST/UnionTypeDefinitionNode.php +++ b/src/Language/AST/UnionTypeDefinitionNode.php @@ -20,5 +20,4 @@ class UnionTypeDefinitionNode extends Node implements TypeDefinitionNode /** @var StringValueNode|null */ public $description; - } diff --git a/src/Language/AST/UnionTypeExtensionNode.php b/src/Language/AST/UnionTypeExtensionNode.php index 5b2e2d4..53bf3ed 100644 --- a/src/Language/AST/UnionTypeExtensionNode.php +++ b/src/Language/AST/UnionTypeExtensionNode.php @@ -17,5 +17,4 @@ class UnionTypeExtensionNode extends Node implements TypeExtensionNode /** @var NamedTypeNode[]|null */ public $types; - } diff --git a/src/Language/AST/VariableDefinitionNode.php b/src/Language/AST/VariableDefinitionNode.php index 8918d6c..eb76b66 100644 --- a/src/Language/AST/VariableDefinitionNode.php +++ b/src/Language/AST/VariableDefinitionNode.php @@ -17,5 +17,4 @@ class VariableDefinitionNode extends Node implements DefinitionNode /** @var ValueNode|null */ public $defaultValue; - } diff --git a/src/Language/AST/VariableNode.php b/src/Language/AST/VariableNode.php index 12a2155..be72ca9 100644 --- a/src/Language/AST/VariableNode.php +++ b/src/Language/AST/VariableNode.php @@ -11,5 +11,4 @@ class VariableNode extends Node /** @var NameNode */ public $name; - } diff --git a/src/Utils/AST.php b/src/Utils/AST.php index 821fdd9..a1eaac2 100644 --- a/src/Utils/AST.php +++ b/src/Utils/AST.php @@ -49,9 +49,7 @@ use function is_int; use function is_object; use function is_string; use function iterator_to_array; -use function json_encode; use function property_exists; -use function substr; /** * Various utilities dealing with AST @@ -278,9 +276,7 @@ class AST // Use json_encode, which uses the same string encoding as GraphQL, // then remove the quotes. - return new StringValueNode([ - 'value' => $serialized - ]); + return new StringValueNode(['value' => $serialized]); } throw new InvariantViolation('Cannot convert value to AST: ' . Utils::printSafe($serialized)); diff --git a/src/Utils/TypeInfo.php b/src/Utils/TypeInfo.php index 9a05ad4..e27bf5a 100644 --- a/src/Utils/TypeInfo.php +++ b/src/Utils/TypeInfo.php @@ -31,6 +31,7 @@ use function array_map; use function array_merge; use function array_pop; use function count; +use function is_array; use function sprintf; /** @@ -198,9 +199,8 @@ class TypeInfo } /** - * @param Directive $directive - * @param array $typeMap - * @return array + * @param Type[] $typeMap + * @return Type[] */ public static function extractTypesFromDirectives(Directive $directive, array $typeMap = []) { diff --git a/src/Utils/Utils.php b/src/Utils/Utils.php index a4f5884..e1cfcef 100644 --- a/src/Utils/Utils.php +++ b/src/Utils/Utils.php @@ -181,7 +181,7 @@ class Utils $map = []; foreach ($traversable as $key => $value) { list($newKey, $newValue) = $fn($value, $key); - $map[$newKey] = $newValue; + $map[$newKey] = $newValue; } return $map; diff --git a/src/Validator/ValidationContext.php b/src/Validator/ValidationContext.php index d8a834e..2f44734 100644 --- a/src/Validator/ValidationContext.php +++ b/src/Validator/ValidationContext.php @@ -191,7 +191,7 @@ class ValidationContext { $spreads = $this->fragmentSpreads[$node] ?? null; if (! $spreads) { - $spreads = []; + $spreads = []; /** @var SelectionSetNode[] $setsToVisit */ $setsToVisit = [$node->selectionSet]; while (! empty($setsToVisit)) {