From 350a53863b4bc0c617483ec4588ef7f919b4d650 Mon Sep 17 00:00:00 2001 From: Christoffer Niska Date: Thu, 1 Mar 2018 00:08:49 +0200 Subject: [PATCH 1/2] Flatten directory structure --- src/ConfigObject.php | 2 -- src/{Behavior => }/ConfigTrait.php | 2 +- src/Error/GraphQLError.php | 2 +- src/Language/AST/Builder/AbstractBuilder.php | 4 ++-- src/Language/AST/Builder/ArgumentBuilder.php | 2 +- .../AST/Builder/Behavior/ParseAliasTrait.php | 24 ------------------- src/Language/AST/Builder/BooleanBuilder.php | 2 +- .../{Contract => }/BuilderInterface.php | 4 ++-- src/Language/AST/Builder/DirectiveBuilder.php | 2 +- .../Builder/DirectiveDefinitionBuilder.php | 2 +- .../{Contract => }/DirectorInterface.php | 4 ++-- src/Language/AST/Builder/DocumentBuilder.php | 4 ++-- src/Language/AST/Builder/EnumBuilder.php | 2 +- .../AST/Builder/EnumTypeDefinitionBuilder.php | 2 +- .../AST/Builder/EnumTypeExtensionBuilder.php | 2 +- .../Builder/EnumValueDefinitionBuilder.php | 2 +- src/Language/AST/Builder/FieldBuilder.php | 2 +- .../AST/Builder/FieldDefinitionBuilder.php | 2 +- src/Language/AST/Builder/FloatBuilder.php | 2 +- .../AST/Builder/FragmentDefinitionBuilder.php | 2 +- .../AST/Builder/FragmentSpreadBuilder.php | 2 +- .../AST/Builder/InlineFragmentBuilder.php | 2 +- .../InputObjectTypeDefinitionBuilder.php | 2 +- .../InputObjectTypeExtensionBuilder.php | 2 +- .../Builder/InputValueDefinitionBuilder.php | 2 +- src/Language/AST/Builder/IntBuilder.php | 2 +- .../InterfaceTypeDefinitionBuilder.php | 2 +- .../Builder/InterfaceTypeExtensionBuilder.php | 2 +- src/Language/AST/Builder/ListBuilder.php | 2 +- src/Language/AST/Builder/ListTypeBuilder.php | 2 +- src/Language/AST/Builder/NameBuilder.php | 2 +- src/Language/AST/Builder/NamedTypeBuilder.php | 2 +- .../AST/Builder/NonNullTypeBuilder.php | 2 +- src/Language/AST/Builder/NullBuilder.php | 2 +- src/Language/AST/Builder/ObjectBuilder.php | 2 +- .../AST/Builder/ObjectFieldBuilder.php | 2 +- .../Builder/ObjectTypeDefinitionBuilder.php | 2 +- .../Builder/ObjectTypeExtensionBuilder.php | 2 +- .../Builder/OperationDefinitionBuilder.php | 2 +- .../OperationTypeDefinitionBuilder.php | 2 +- .../Builder/ScalarTypeDefinitionBuilder.php | 2 +- .../Builder/ScalarTypeExtensionBuilder.php | 2 +- .../AST/Builder/SchemaDefinitionBuilder.php | 2 +- .../AST/Builder/SelectionSetBuilder.php | 2 +- src/Language/AST/Builder/StringBuilder.php | 2 +- .../Builder/UnionTypeDefinitionBuilder.php | 2 +- .../AST/Builder/UnionTypeExtensionBuilder.php | 2 +- src/Language/AST/Builder/VariableBuilder.php | 2 +- .../AST/Builder/VariableDefinitionBuilder.php | 2 +- src/Language/AST/Node/AbstractNode.php | 2 +- .../AST/Node/{Behavior => }/AliasTrait.php | 2 +- src/Language/AST/Node/ArgumentNode.php | 6 ++--- .../Node/{Behavior => }/ArgumentsTrait.php | 4 ++-- src/Language/AST/Node/BooleanValueNode.php | 4 ++-- .../Node/{Behavior => }/DefaultValueTrait.php | 6 ++--- .../DefinitionNodeInterface.php | 2 +- .../Node/{Behavior => }/DescriptionTrait.php | 2 +- .../AST/Node/DirectiveDefinitionNode.php | 10 ++++---- src/Language/AST/Node/DirectiveNode.php | 4 ++-- .../Node/{Behavior => }/DirectivesTrait.php | 4 ++-- src/Language/AST/Node/DocumentNode.php | 6 ++--- .../AST/Node/EnumTypeDefinitionNode.php | 10 ++++---- .../AST/Node/EnumTypeExtensionNode.php | 8 +++---- .../AST/Node/EnumValueDefinitionNode.php | 8 +++---- src/Language/AST/Node/EnumValueNode.php | 4 ++-- .../Node/{Behavior => }/EnumValuesTrait.php | 4 ++-- .../ExecutableDefinitionNodeInterface.php | 2 +- src/Language/AST/Node/FieldDefinitionNode.php | 12 +++++----- src/Language/AST/Node/FieldNode.php | 12 +++++----- .../AST/Node/{Behavior => }/FieldsTrait.php | 4 ++-- src/Language/AST/Node/FloatValueNode.php | 4 ++-- .../AST/Node/FragmentDefinitionNode.php | 10 ++++---- src/Language/AST/Node/FragmentSpreadNode.php | 8 +++---- src/Language/AST/Node/InlineFragmentNode.php | 8 +++---- .../Node/{Behavior => }/InputFieldsTrait.php | 4 ++-- .../Node/InputObjectTypeDefinitionNode.php | 10 ++++---- .../AST/Node/InputObjectTypeExtensionNode.php | 8 +++---- .../AST/Node/InputValueDefinitionNode.php | 12 +++++----- src/Language/AST/Node/IntValueNode.php | 4 ++-- .../AST/Node/InterfaceTypeDefinitionNode.php | 10 ++++---- .../AST/Node/InterfaceTypeExtensionNode.php | 8 +++---- .../Node/{Behavior => }/InterfacesTrait.php | 4 ++-- src/Language/AST/Node/ListTypeNode.php | 4 ++-- src/Language/AST/Node/ListValueNode.php | 4 ++-- src/Language/AST/Node/NameNode.php | 4 ++-- .../AST/Node/{Behavior => }/NameTrait.php | 2 +- src/Language/AST/Node/NamedTypeNode.php | 4 ++-- .../AST/Node/{Contract => }/NodeInterface.php | 2 +- src/Language/AST/Node/NodeTrait.php | 2 +- src/Language/AST/Node/NonNullTypeNode.php | 4 ++-- src/Language/AST/Node/NullValueNode.php | 2 +- src/Language/AST/Node/ObjectFieldNode.php | 6 ++--- .../AST/Node/ObjectTypeDefinitionNode.php | 12 +++++----- .../AST/Node/ObjectTypeExtensionNode.php | 10 ++++---- src/Language/AST/Node/ObjectValueNode.php | 2 +- .../AST/Node/OperationDefinitionNode.php | 12 +++++----- .../AST/Node/OperationTypeDefinitionNode.php | 4 ++-- .../AST/Node/ScalarTypeDefinitionNode.php | 8 +++---- .../AST/Node/ScalarTypeExtensionNode.php | 6 ++--- .../AST/Node/SchemaDefinitionNode.php | 6 ++--- .../{Contract => }/SelectionNodeInterface.php | 2 +- src/Language/AST/Node/SelectionSetNode.php | 6 ++--- .../Node/{Behavior => }/SelectionSetTrait.php | 2 +- src/Language/AST/Node/StringValueNode.php | 4 ++-- .../{Behavior => }/TypeConditionTrait.php | 2 +- .../TypeDefinitionNodeInterface.php | 2 +- .../TypeExtensionNodeInterface.php | 2 +- .../Node/{Contract => }/TypeNodeInterface.php | 2 +- .../TypeSystemDefinitionNodeInterface.php | 2 +- .../AST/Node/{Behavior => }/TypeTrait.php | 6 ++--- .../AST/Node/{Behavior => }/TypesTrait.php | 4 ++-- .../AST/Node/UnionTypeDefinitionNode.php | 10 ++++---- .../AST/Node/UnionTypeExtensionNode.php | 8 +++---- .../Node/{Behavior => }/ValueLiteralTrait.php | 6 ++--- .../{Contract => }/ValueNodeInterface.php | 2 +- .../AST/Node}/ValueTrait.php | 2 +- .../AST/Node/VariableDefinitionNode.php | 8 +++---- .../VariableDefinitionsTrait.php | 4 ++-- src/Language/AST/Node/VariableNode.php | 4 ++-- src/Language/Lexer.php | 3 +-- .../{Contract => }/LexerInterface.php | 4 +--- src/Language/Location.php | 2 +- src/Language/{ASTParser.php => Parser.php} | 12 ++++------ .../{Contract => }/ParserInterface.php | 8 ++----- src/Language/Printer.php | 3 +-- .../{Contract => }/PrinterInterface.php | 4 ++-- src/Language/Reader/AbstractReader.php | 1 - .../Reader/{Contract => }/ReaderInterface.php | 2 +- src/Language/Token.php | 2 +- src/Language/parse.php | 5 ++-- src/Language/print.php | 2 +- src/{Contract => }/SerializationInterface.php | 4 ++-- .../{Contract => }/AbstractTypeInterface.php | 2 +- src/Type/Definition/Argument.php | 8 +++---- .../{Behavior => }/ArgumentsTrait.php | 2 +- .../Definition/CompositeTypeInterface.php | 8 +++++++ .../Contract/CompositeTypeInterface.php | 8 ------- .../Contract/InputTypeInterface.php | 8 ------- .../Definition/Contract/LeafTypeInterface.php | 8 ------- .../Contract/NamedTypeInterface.php | 8 ------- .../Contract/OutputTypeInterface.php | 8 ------- .../{Behavior => }/DefaultValueTrait.php | 2 +- .../{Behavior => }/DeprecationTrait.php | 2 +- .../{Behavior => }/DescriptionTrait.php | 2 +- src/Type/Definition/Directive.php | 8 +++---- .../{Contract => }/DirectiveInterface.php | 2 +- src/Type/Definition/EnumType.php | 14 +++++------ src/Type/Definition/EnumValue.php | 8 +++---- .../{Behavior => }/ExtensionASTNodesTrait.php | 2 +- src/Type/Definition/Field.php | 12 +++++----- .../Definition/{Behavior => }/FieldsTrait.php | 2 +- src/Type/Definition/InputField.php | 8 +++---- src/Type/Definition/InputObjectType.php | 8 +++---- src/Type/Definition/InputTypeInterface.php | 8 +++++++ src/Type/Definition/InterfaceType.php | 18 +++++++------- src/Type/Definition/LeafTypeInterface.php | 8 +++++++ src/Type/Definition/ListType.php | 10 ++++---- .../Definition/{Behavior => }/NameTrait.php | 2 +- src/Type/Definition/NamedTypeInterface.php | 8 +++++++ src/Type/Definition/NonNullType.php | 10 ++++---- src/Type/Definition/ObjectType.php | 18 +++++++------- .../Definition/{Behavior => }/OfTypeTrait.php | 4 ++-- src/Type/Definition/OutputTypeInterface.php | 8 +++++++ .../{Behavior => }/ResolveTrait.php | 2 +- .../{Behavior => }/ResolveTypeTrait.php | 4 ++-- src/Type/Definition/ScalarType.php | 16 ++++++------- .../{Contract => }/TypeInterface.php | 2 +- .../Definition/{Behavior => }/TypeTrait.php | 4 ++-- src/Type/Definition/UnionType.php | 14 +++++------ .../Definition}/ValueTrait.php | 2 +- .../{Contract => }/WrappingTypeInterface.php | 2 +- src/Type/Schema.php | 10 ++++---- src/Type/{Contract => }/SchemaInterface.php | 8 +++---- src/Type/definition.php | 18 +++++++------- src/Type/directives.php | 2 +- src/Type/scalars.php | 4 ++-- tests/Functional/Type/DefinitionTest.php | 2 +- tests/Functional/Type/SchemaTest.php | 2 +- 178 files changed, 418 insertions(+), 456 deletions(-) rename src/{Behavior => }/ConfigTrait.php (97%) delete mode 100644 src/Language/AST/Builder/Behavior/ParseAliasTrait.php rename src/Language/AST/Builder/{Contract => }/BuilderInterface.php (77%) rename src/Language/AST/Builder/{Contract => }/DirectorInterface.php (59%) rename src/Language/AST/Node/{Behavior => }/AliasTrait.php (89%) rename src/Language/AST/Node/{Behavior => }/ArgumentsTrait.php (84%) rename src/Language/AST/Node/{Behavior => }/DefaultValueTrait.php (75%) rename src/Language/AST/Node/{Contract => }/DefinitionNodeInterface.php (72%) rename src/Language/AST/Node/{Behavior => }/DescriptionTrait.php (90%) rename src/Language/AST/Node/{Behavior => }/DirectivesTrait.php (81%) rename src/Language/AST/Node/{Behavior => }/EnumValuesTrait.php (83%) rename src/Language/AST/Node/{Contract => }/ExecutableDefinitionNodeInterface.php (63%) rename src/Language/AST/Node/{Behavior => }/FieldsTrait.php (83%) rename src/Language/AST/Node/{Behavior => }/InputFieldsTrait.php (84%) rename src/Language/AST/Node/{Behavior => }/InterfacesTrait.php (83%) rename src/Language/AST/Node/{Behavior => }/NameTrait.php (91%) rename src/Language/AST/Node/{Contract => }/NodeInterface.php (86%) rename src/Language/AST/Node/{Contract => }/SelectionNodeInterface.php (56%) rename src/Language/AST/Node/{Behavior => }/SelectionSetTrait.php (90%) rename src/Language/AST/Node/{Behavior => }/TypeConditionTrait.php (85%) rename src/Language/AST/Node/{Contract => }/TypeDefinitionNodeInterface.php (61%) rename src/Language/AST/Node/{Contract => }/TypeExtensionNodeInterface.php (58%) rename src/Language/AST/Node/{Contract => }/TypeNodeInterface.php (54%) rename src/Language/AST/Node/{Contract => }/TypeSystemDefinitionNodeInterface.php (63%) rename src/Language/AST/Node/{Behavior => }/TypeTrait.php (70%) rename src/Language/AST/Node/{Behavior => }/TypesTrait.php (82%) rename src/Language/AST/Node/{Behavior => }/ValueLiteralTrait.php (72%) rename src/Language/AST/Node/{Contract => }/ValueNodeInterface.php (54%) rename src/{Type/Definition/Behavior => Language/AST/Node}/ValueTrait.php (80%) rename src/Language/AST/Node/{Behavior => }/VariableDefinitionsTrait.php (85%) rename src/Language/{Contract => }/LexerInterface.php (89%) rename src/Language/{ASTParser.php => Parser.php} (99%) rename src/Language/{Contract => }/ParserInterface.php (87%) rename src/Language/{Contract => }/PrinterInterface.php (62%) rename src/Language/Reader/{Contract => }/ReaderInterface.php (91%) rename src/{Contract => }/SerializationInterface.php (68%) rename src/Type/Definition/{Contract => }/AbstractTypeInterface.php (57%) rename src/Type/Definition/{Behavior => }/ArgumentsTrait.php (96%) create mode 100644 src/Type/Definition/CompositeTypeInterface.php delete mode 100644 src/Type/Definition/Contract/CompositeTypeInterface.php delete mode 100644 src/Type/Definition/Contract/InputTypeInterface.php delete mode 100644 src/Type/Definition/Contract/LeafTypeInterface.php delete mode 100644 src/Type/Definition/Contract/NamedTypeInterface.php delete mode 100644 src/Type/Definition/Contract/OutputTypeInterface.php rename src/Type/Definition/{Behavior => }/DefaultValueTrait.php (89%) rename src/Type/Definition/{Behavior => }/DeprecationTrait.php (95%) rename src/Type/Definition/{Behavior => }/DescriptionTrait.php (90%) rename src/Type/Definition/{Contract => }/DirectiveInterface.php (84%) rename src/Type/Definition/{Behavior => }/ExtensionASTNodesTrait.php (94%) rename src/Type/Definition/{Behavior => }/FieldsTrait.php (98%) create mode 100644 src/Type/Definition/InputTypeInterface.php create mode 100644 src/Type/Definition/LeafTypeInterface.php rename src/Type/Definition/{Behavior => }/NameTrait.php (90%) create mode 100644 src/Type/Definition/NamedTypeInterface.php rename src/Type/Definition/{Behavior => }/OfTypeTrait.php (80%) create mode 100644 src/Type/Definition/OutputTypeInterface.php rename src/Type/Definition/{Behavior => }/ResolveTrait.php (91%) rename src/Type/Definition/{Behavior => }/ResolveTypeTrait.php (84%) rename src/Type/Definition/{Contract => }/TypeInterface.php (85%) rename src/Type/Definition/{Behavior => }/TypeTrait.php (79%) rename src/{Language/AST/Node/Behavior => Type/Definition}/ValueTrait.php (79%) rename src/Type/Definition/{Contract => }/WrappingTypeInterface.php (73%) rename src/Type/{Contract => }/SchemaInterface.php (83%) diff --git a/src/ConfigObject.php b/src/ConfigObject.php index b4a3960f..4b688b86 100644 --- a/src/ConfigObject.php +++ b/src/ConfigObject.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL; -use Digia\GraphQL\Behavior\ConfigTrait; - class ConfigObject { diff --git a/src/Behavior/ConfigTrait.php b/src/ConfigTrait.php similarity index 97% rename from src/Behavior/ConfigTrait.php rename to src/ConfigTrait.php index 25ac58e5..3dfe5960 100644 --- a/src/Behavior/ConfigTrait.php +++ b/src/ConfigTrait.php @@ -1,6 +1,6 @@ getDirector()->build($ast['alias']) : null; - } -} diff --git a/src/Language/AST/Builder/BooleanBuilder.php b/src/Language/AST/Builder/BooleanBuilder.php index 6f8bfb6b..18eba3c1 100644 --- a/src/Language/AST/Builder/BooleanBuilder.php +++ b/src/Language/AST/Builder/BooleanBuilder.php @@ -3,7 +3,7 @@ namespace Digia\GraphQL\Language\AST\Builder; use Digia\GraphQL\Language\AST\Node\BooleanValueNode; -use Digia\GraphQL\Language\AST\Node\Contract\NodeInterface; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class BooleanBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/Contract/BuilderInterface.php b/src/Language/AST/Builder/BuilderInterface.php similarity index 77% rename from src/Language/AST/Builder/Contract/BuilderInterface.php rename to src/Language/AST/Builder/BuilderInterface.php index 27ffec5e..a6978475 100644 --- a/src/Language/AST/Builder/Contract/BuilderInterface.php +++ b/src/Language/AST/Builder/BuilderInterface.php @@ -1,8 +1,8 @@ Date: Thu, 1 Mar 2018 00:10:17 +0200 Subject: [PATCH 2/2] Fix formatting --- src/ConfigTrait.php | 2 - src/Error/SyntaxError.php | 1 + src/Execution/Execution.php | 27 +++--- src/Execution/ExecutionArguments.php | 18 ++-- src/Execution/ExecutionContext.php | 21 ++--- src/Execution/ExecutionResult.php | 4 +- src/Execution/ExecutionStrategy.php | 47 +++++----- src/Execution/ExecutorExecutionStrategy.php | 3 +- src/Language/AST/Builder/AbstractBuilder.php | 2 - src/Language/AST/Builder/DirectiveBuilder.php | 2 +- .../Builder/DirectiveDefinitionBuilder.php | 2 +- src/Language/AST/Builder/DocumentBuilder.php | 3 +- src/Language/AST/Builder/EnumBuilder.php | 3 +- .../AST/Builder/EnumTypeDefinitionBuilder.php | 2 +- .../AST/Builder/EnumTypeExtensionBuilder.php | 2 +- .../Builder/EnumValueDefinitionBuilder.php | 2 +- src/Language/AST/Builder/FieldBuilder.php | 2 +- .../AST/Builder/FieldDefinitionBuilder.php | 2 +- src/Language/AST/Builder/FloatBuilder.php | 2 +- .../AST/Builder/FragmentDefinitionBuilder.php | 2 +- .../AST/Builder/FragmentSpreadBuilder.php | 2 +- .../AST/Builder/InlineFragmentBuilder.php | 2 +- .../InputObjectTypeDefinitionBuilder.php | 2 +- .../InputObjectTypeExtensionBuilder.php | 2 +- .../Builder/InputValueDefinitionBuilder.php | 2 +- src/Language/AST/Builder/IntBuilder.php | 2 +- .../InterfaceTypeDefinitionBuilder.php | 2 +- .../Builder/InterfaceTypeExtensionBuilder.php | 2 +- src/Language/AST/Builder/ListBuilder.php | 2 +- src/Language/AST/Builder/ListTypeBuilder.php | 2 +- src/Language/AST/Builder/NameBuilder.php | 2 +- src/Language/AST/Builder/NamedTypeBuilder.php | 2 +- .../OperationTypeDefinitionBuilder.php | 6 +- .../Builder/ScalarTypeExtensionBuilder.php | 7 +- src/Language/AST/Node/AbstractNode.php | 2 +- src/Language/AST/Node/AliasTrait.php | 2 - src/Language/AST/Node/ArgumentNode.php | 3 - src/Language/AST/Node/ArgumentsTrait.php | 1 - src/Language/AST/Node/BooleanValueNode.php | 2 - src/Language/AST/Node/DefaultValueTrait.php | 1 - src/Language/AST/Node/DescriptionTrait.php | 2 - .../AST/Node/DirectiveDefinitionNode.php | 6 +- src/Language/AST/Node/DirectiveNode.php | 2 - src/Language/AST/Node/DirectivesTrait.php | 3 - src/Language/AST/Node/DocumentNode.php | 4 +- .../AST/Node/EnumTypeDefinitionNode.php | 5 -- .../AST/Node/EnumTypeExtensionNode.php | 14 ++- .../AST/Node/EnumValueDefinitionNode.php | 4 - src/Language/AST/Node/EnumValueNode.php | 2 - src/Language/AST/Node/EnumValuesTrait.php | 1 - src/Language/AST/Node/FieldDefinitionNode.php | 6 -- src/Language/AST/Node/FieldNode.php | 6 -- src/Language/AST/Node/FieldsTrait.php | 1 - src/Language/AST/Node/FloatValueNode.php | 2 - .../AST/Node/FragmentDefinitionNode.php | 5 -- src/Language/AST/Node/FragmentSpreadNode.php | 4 - src/Language/AST/Node/InlineFragmentNode.php | 4 - src/Language/AST/Node/InputFieldsTrait.php | 1 - .../Node/InputObjectTypeDefinitionNode.php | 5 -- .../AST/Node/InputObjectTypeExtensionNode.php | 14 ++- .../AST/Node/InputValueDefinitionNode.php | 6 -- src/Language/AST/Node/IntValueNode.php | 2 - .../AST/Node/InterfaceTypeDefinitionNode.php | 5 -- .../AST/Node/InterfaceTypeExtensionNode.php | 14 ++- src/Language/AST/Node/InterfacesTrait.php | 1 - src/Language/AST/Node/ListTypeNode.php | 2 - src/Language/AST/Node/ListValueNode.php | 3 +- src/Language/AST/Node/NameNode.php | 2 - src/Language/AST/Node/NameTrait.php | 2 - src/Language/AST/Node/NamedTypeNode.php | 2 - src/Language/AST/Node/NodeTrait.php | 2 - src/Language/AST/Node/NonNullTypeNode.php | 2 - src/Language/AST/Node/NullValueNode.php | 1 - src/Language/AST/Node/ObjectFieldNode.php | 3 - .../AST/Node/ObjectTypeDefinitionNode.php | 6 -- .../AST/Node/ObjectTypeExtensionNode.php | 17 ++-- src/Language/AST/Node/ObjectValueNode.php | 1 - .../AST/Node/OperationDefinitionNode.php | 6 -- .../AST/Node/OperationTypeDefinitionNode.php | 2 - .../AST/Node/ScalarTypeDefinitionNode.php | 4 - .../AST/Node/ScalarTypeExtensionNode.php | 3 - .../AST/Node/SchemaDefinitionNode.php | 4 +- src/Language/AST/Node/SelectionSetNode.php | 4 +- src/Language/AST/Node/SelectionSetTrait.php | 2 - src/Language/AST/Node/StringValueNode.php | 2 - src/Language/AST/Node/TypeConditionTrait.php | 2 - src/Language/AST/Node/TypeTrait.php | 1 - src/Language/AST/Node/TypesTrait.php | 1 - .../AST/Node/UnionTypeDefinitionNode.php | 5 -- .../AST/Node/UnionTypeExtensionNode.php | 4 - src/Language/AST/Node/ValueLiteralTrait.php | 1 - src/Language/AST/Node/ValueNodeInterface.php | 1 + .../AST/Node/VariableDefinitionNode.php | 4 - .../AST/Node/VariableDefinitionsTrait.php | 1 - src/Language/AST/Node/VariableNode.php | 2 - src/Language/Parser.php | 52 +++++------ src/Language/Reader/BlockStringReader.php | 6 +- src/Language/Reader/CommentReader.php | 4 +- src/Language/Reader/NameReader.php | 4 +- src/Language/Reader/NumberReader.php | 6 +- src/Language/Reader/ReaderInterface.php | 15 ++-- src/Language/Reader/SpreadReader.php | 2 +- src/Language/Reader/StringReader.php | 7 +- src/Language/blockStringValue.php | 4 +- src/Type/Definition/Argument.php | 4 - src/Type/Definition/ArgumentsTrait.php | 1 - src/Type/Definition/Directive.php | 4 - src/Type/Definition/EnumType.php | 8 +- src/Type/Definition/EnumValue.php | 4 - src/Type/Definition/Field.php | 6 -- src/Type/Definition/FieldsTrait.php | 2 - src/Type/Definition/InputField.php | 4 - src/Type/Definition/InputObjectType.php | 4 - src/Type/Definition/InterfaceType.php | 9 -- src/Type/Definition/ListType.php | 6 -- src/Type/Definition/NonNullType.php | 6 -- src/Type/Definition/ObjectType.php | 9 -- src/Type/Definition/OfTypeTrait.php | 2 - src/Type/Definition/ResolveTypeTrait.php | 2 - src/Type/Definition/ScalarType.php | 7 -- src/Type/Definition/TypeTrait.php | 2 - src/Type/Definition/UnionType.php | 7 -- src/Type/Schema.php | 7 +- src/Type/SchemaInterface.php | 3 +- src/Type/definition.php | 16 ++-- src/Type/directives.php | 3 +- src/Type/scalars.php | 34 +++---- tests/Functional/Execution/ExecutionTest.php | 88 ++++++++++--------- tests/Functional/Execution/MutationTest.php | 12 ++- tests/Functional/Type/DefinitionTest.php | 3 +- tests/Functional/Type/EnumTypeTest.php | 2 +- tests/Functional/Type/PredicateTest.php | 4 +- tests/Functional/Type/SchemaTest.php | 8 +- 133 files changed, 260 insertions(+), 515 deletions(-) diff --git a/src/ConfigTrait.php b/src/ConfigTrait.php index 3dfe5960..252e638a 100644 --- a/src/ConfigTrait.php +++ b/src/ConfigTrait.php @@ -26,7 +26,6 @@ public function __construct(array $config = []) * Override this method to perform logic BEFORE configuration is applied. * This method is useful for setting default values for properties * that need to use new -keyword. - * * If you do, just remember to call the parent implementation. */ protected function beforeConfig(): void @@ -37,7 +36,6 @@ protected function beforeConfig(): void * Override this method to perform logic AFTER configuration is applied. * This method is useful for configuring classes after instantiation, * e.g. adding a query type to a schema or adding fields to object types. - * * If you do, just remember to call the parent implementation. */ protected function afterConfig(): void diff --git a/src/Error/SyntaxError.php b/src/Error/SyntaxError.php index 86382057..59a87ac0 100644 --- a/src/Error/SyntaxError.php +++ b/src/Error/SyntaxError.php @@ -4,4 +4,5 @@ class SyntaxError extends GraphQLError { + } diff --git a/src/Execution/Execution.php b/src/Execution/Execution.php index c2f49c60..c59dea8e 100644 --- a/src/Execution/Execution.php +++ b/src/Execution/Execution.php @@ -9,10 +9,12 @@ /** * Class Execution + * * @package Digia\GraphQL\Execution */ class Execution { + /** * @var ExecutionContext */ @@ -20,6 +22,7 @@ class Execution /** * Execution constructor. + * * @param ExecutionContext $context */ public function __construct(ExecutionContext $context) @@ -28,12 +31,12 @@ public function __construct(ExecutionContext $context) } /** - * @param Schema $schema - * @param DocumentNode $documentNode - * @param null $rootValue - * @param null $contextValue - * @param null $variableValues - * @param null $operationName + * @param Schema $schema + * @param DocumentNode $documentNode + * @param null $rootValue + * @param null $contextValue + * @param null $variableValues + * @param null $operationName * @param callable|null $fieldResolver * @return ExecutionResult */ @@ -67,12 +70,12 @@ public static function execute( /** * @TODO: Consider to create a ExecutionContextBuilder - * @param Schema $schema - * @param DocumentNode $documentNode - * @param $rootValue - * @param $contextValue - * @param $rawVariableValues - * @param null $operationName + * @param Schema $schema + * @param DocumentNode $documentNode + * @param $rootValue + * @param $contextValue + * @param $rawVariableValues + * @param null $operationName * @param callable|null $fieldResolver * @throws GraphQLError * @return ExecutionContext diff --git a/src/Execution/ExecutionArguments.php b/src/Execution/ExecutionArguments.php index 3cf2f127..f32c98ed 100644 --- a/src/Execution/ExecutionArguments.php +++ b/src/Execution/ExecutionArguments.php @@ -8,6 +8,7 @@ class ExecutionArguments { + /** * @var Schema */ @@ -45,13 +46,14 @@ class ExecutionArguments /** * ExecutionArguments constructor. - * @param Schema $schema - * @param DocumentNode $document - * @param mixed $rootValue - * @param mixed $contextValue - * @param $variableValues + * + * @param Schema $schema + * @param DocumentNode $document + * @param mixed $rootValue + * @param mixed $contextValue + * @param $variableValues * @param OperationDefinitionNode $operation - * @param mixed $fieldResolver + * @param mixed $fieldResolver */ public function __construct( Schema $schema, @@ -60,8 +62,8 @@ public function __construct( mixed $contextValue, $variableValues, OperationDefinitionNode $operation, - mixed $fieldResolver) - { + mixed $fieldResolver + ) { $this->schema = $schema; $this->document = $document; $this->rootValue = $rootValue; diff --git a/src/Execution/ExecutionContext.php b/src/Execution/ExecutionContext.php index 7fa4d669..295e4a24 100644 --- a/src/Execution/ExecutionContext.php +++ b/src/Execution/ExecutionContext.php @@ -9,6 +9,7 @@ class ExecutionContext { + /** * @var Schema */ @@ -51,14 +52,15 @@ class ExecutionContext /** * ExecutionContext constructor. - * @param Schema $schema - * @param array $fragments - * @param $rootValue - * @param $contextValue - * @param $variableValues - * @param $fieldResolver + * + * @param Schema $schema + * @param array $fragments + * @param $rootValue + * @param $contextValue + * @param $variableValues + * @param $fieldResolver * @param OperationDefinitionNode $operatgion - * @param array $errors + * @param array $errors */ public function __construct( Schema $schema, @@ -68,8 +70,8 @@ public function __construct( $variableValues, $fieldResolver, OperationDefinitionNode $operation, - array $errors) - { + array $errors + ) { $this->schema = $schema; $this->fragments = $fragments; $this->rootValue = $rootValue; @@ -80,7 +82,6 @@ public function __construct( $this->errors = $errors; } - /** * @return OperationDefinitionNode */ diff --git a/src/Execution/ExecutionResult.php b/src/Execution/ExecutionResult.php index 413f128c..167926a3 100644 --- a/src/Execution/ExecutionResult.php +++ b/src/Execution/ExecutionResult.php @@ -6,6 +6,7 @@ class ExecutionResult { + /** * @var GraphQLError[] */ @@ -18,7 +19,8 @@ class ExecutionResult /** * ExecutionResult constructor. - * @param mixed[] $data + * + * @param mixed[] $data * @param GraphQLError[] $errors */ public function __construct(array $data, array $errors) diff --git a/src/Execution/ExecutionStrategy.php b/src/Execution/ExecutionStrategy.php index 70b2fd90..e54acc8c 100644 --- a/src/Execution/ExecutionStrategy.php +++ b/src/Execution/ExecutionStrategy.php @@ -14,10 +14,12 @@ /** * Class AbstractStrategy + * * @package Digia\GraphQL\Execution\Strategies */ abstract class ExecutionStrategy { + /** * @var ExecutionContext */ @@ -35,15 +37,15 @@ abstract class ExecutionStrategy /** * AbstractStrategy constructor. - * @param ExecutionContext $context * + * @param ExecutionContext $context * @param OperationDefinitionNode $operation */ public function __construct( ExecutionContext $context, OperationDefinitionNode $operation, - $rootValue) - { + $rootValue + ) { $this->context = $context; $this->operation = $operation; $this->rootValue = $rootValue; @@ -55,10 +57,10 @@ public function __construct( abstract function execute(): ?array; /** - * @param ObjectType $runtimeType + * @param ObjectType $runtimeType * @param SelectionSetNode $selectionSet - * @param $fields - * @param $visitedFragmentNames + * @param $fields + * @param $visitedFragmentNames * @return \ArrayObject */ protected function collectFields( @@ -110,21 +112,20 @@ protected function collectFields( /** * Implements the "Evaluating selection sets" section of the spec * for "read" mode. - * @param ObjectType $parentType - * @param $source - * @param $path - * @param $fields * + * @param ObjectType $parentType + * @param $source + * @param $path + * @param $fields * @return array - * * @throws GraphQLError|\Exception */ protected function executeFields( ObjectType $parentType, $source, $path, - $fields): array - { + $fields + ): array { $finalResults = []; foreach ($fields as $fieldName => $fieldNodes) { @@ -148,31 +149,29 @@ protected function executeFields( /** * @param ObjectType $parentType - * @param string $fieldName + * @param string $fieldName * @return bool * @throws \Exception */ protected function isDefinedField(ObjectType $parentType, string $fieldName) { - return isset($parentType->getFields()[$fieldName]); + return isset($parentType->getFields()[$fieldName]); } /** * @param ObjectType $parentType - * @param $source - * @param $fieldNodes - * @param $path - * + * @param $source + * @param $fieldNodes + * @param $path * @return mixed - * * @throws GraphQLError|\Exception */ protected function resolveField( ObjectType $parentType, $source, $fieldNodes, - $path) - { + $path + ) { /** @var FieldNode $fieldNode */ $fieldNode = $fieldNodes[0]; @@ -202,8 +201,8 @@ private function completeValue( $fieldNodes, $info, $path, - &$result) - { + &$result + ) { } diff --git a/src/Execution/ExecutorExecutionStrategy.php b/src/Execution/ExecutorExecutionStrategy.php index 5f1ea23e..b5290309 100644 --- a/src/Execution/ExecutorExecutionStrategy.php +++ b/src/Execution/ExecutorExecutionStrategy.php @@ -19,7 +19,8 @@ function execute(): ?array ? $schema->getMutation() : $schema->getQuery(); - $fields = $this->collectFields($objectType, $this->operation->getSelectionSet(), new \ArrayObject(), new \ArrayObject()); + $fields = $this->collectFields($objectType, $this->operation->getSelectionSet(), new \ArrayObject(), + new \ArrayObject()); $path = []; try { diff --git a/src/Language/AST/Builder/AbstractBuilder.php b/src/Language/AST/Builder/AbstractBuilder.php index 99ac75cd..b91f2719 100644 --- a/src/Language/AST/Builder/AbstractBuilder.php +++ b/src/Language/AST/Builder/AbstractBuilder.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Builder\BuilderInterface; -use Digia\GraphQL\Language\AST\Builder\DirectorInterface; use Digia\GraphQL\Language\Location; abstract class AbstractBuilder implements BuilderInterface diff --git a/src/Language/AST/Builder/DirectiveBuilder.php b/src/Language/AST/Builder/DirectiveBuilder.php index 7c6438f8..ff137741 100644 --- a/src/Language/AST/Builder/DirectiveBuilder.php +++ b/src/Language/AST/Builder/DirectiveBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\DirectiveNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class DirectiveBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/DirectiveDefinitionBuilder.php b/src/Language/AST/Builder/DirectiveDefinitionBuilder.php index dd96c223..df501e9b 100644 --- a/src/Language/AST/Builder/DirectiveDefinitionBuilder.php +++ b/src/Language/AST/Builder/DirectiveDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\DirectiveDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class DirectiveDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/DocumentBuilder.php b/src/Language/AST/Builder/DocumentBuilder.php index dbbe6311..8dfd4f13 100644 --- a/src/Language/AST/Builder/DocumentBuilder.php +++ b/src/Language/AST/Builder/DocumentBuilder.php @@ -2,9 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\DocumentNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class DocumentBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/EnumBuilder.php b/src/Language/AST/Builder/EnumBuilder.php index c8a5b90e..6e1dc43d 100644 --- a/src/Language/AST/Builder/EnumBuilder.php +++ b/src/Language/AST/Builder/EnumBuilder.php @@ -2,9 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\EnumValueNode; -use Digia\GraphQL\Language\AST\Node\IntValueNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class EnumBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/EnumTypeDefinitionBuilder.php b/src/Language/AST/Builder/EnumTypeDefinitionBuilder.php index f6c09f69..03350e77 100644 --- a/src/Language/AST/Builder/EnumTypeDefinitionBuilder.php +++ b/src/Language/AST/Builder/EnumTypeDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\EnumTypeDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class EnumTypeDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/EnumTypeExtensionBuilder.php b/src/Language/AST/Builder/EnumTypeExtensionBuilder.php index fa48d54b..4a67954f 100644 --- a/src/Language/AST/Builder/EnumTypeExtensionBuilder.php +++ b/src/Language/AST/Builder/EnumTypeExtensionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\EnumTypeExtensionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class EnumTypeExtensionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/EnumValueDefinitionBuilder.php b/src/Language/AST/Builder/EnumValueDefinitionBuilder.php index 8a0cec3f..87bc1774 100644 --- a/src/Language/AST/Builder/EnumValueDefinitionBuilder.php +++ b/src/Language/AST/Builder/EnumValueDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\EnumValueDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class EnumValueDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/FieldBuilder.php b/src/Language/AST/Builder/FieldBuilder.php index e2080b57..0c934906 100644 --- a/src/Language/AST/Builder/FieldBuilder.php +++ b/src/Language/AST/Builder/FieldBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\FieldNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FieldBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/FieldDefinitionBuilder.php b/src/Language/AST/Builder/FieldDefinitionBuilder.php index 149e0812..ba40e454 100644 --- a/src/Language/AST/Builder/FieldDefinitionBuilder.php +++ b/src/Language/AST/Builder/FieldDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\FieldDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FieldDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/FloatBuilder.php b/src/Language/AST/Builder/FloatBuilder.php index 7e6ed0c4..f4539a7a 100644 --- a/src/Language/AST/Builder/FloatBuilder.php +++ b/src/Language/AST/Builder/FloatBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\FloatValueNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FloatBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/FragmentDefinitionBuilder.php b/src/Language/AST/Builder/FragmentDefinitionBuilder.php index 62aa7f82..dfbe0436 100644 --- a/src/Language/AST/Builder/FragmentDefinitionBuilder.php +++ b/src/Language/AST/Builder/FragmentDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\FragmentSpreadNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FragmentDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/FragmentSpreadBuilder.php b/src/Language/AST/Builder/FragmentSpreadBuilder.php index c43623f3..ba057209 100644 --- a/src/Language/AST/Builder/FragmentSpreadBuilder.php +++ b/src/Language/AST/Builder/FragmentSpreadBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\FragmentSpreadNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FragmentSpreadBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/InlineFragmentBuilder.php b/src/Language/AST/Builder/InlineFragmentBuilder.php index a449c560..e28b5b1e 100644 --- a/src/Language/AST/Builder/InlineFragmentBuilder.php +++ b/src/Language/AST/Builder/InlineFragmentBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\InlineFragmentNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InlineFragmentBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/InputObjectTypeDefinitionBuilder.php b/src/Language/AST/Builder/InputObjectTypeDefinitionBuilder.php index 8154d84a..073fa913 100644 --- a/src/Language/AST/Builder/InputObjectTypeDefinitionBuilder.php +++ b/src/Language/AST/Builder/InputObjectTypeDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\InputObjectTypeDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InputObjectTypeDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/InputObjectTypeExtensionBuilder.php b/src/Language/AST/Builder/InputObjectTypeExtensionBuilder.php index 6f33f4ad..3a910a00 100644 --- a/src/Language/AST/Builder/InputObjectTypeExtensionBuilder.php +++ b/src/Language/AST/Builder/InputObjectTypeExtensionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\InputObjectTypeExtensionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InputObjectTypeExtensionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/InputValueDefinitionBuilder.php b/src/Language/AST/Builder/InputValueDefinitionBuilder.php index 5a651a21..337db296 100644 --- a/src/Language/AST/Builder/InputValueDefinitionBuilder.php +++ b/src/Language/AST/Builder/InputValueDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InputValueDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/IntBuilder.php b/src/Language/AST/Builder/IntBuilder.php index 819c4af1..af55c9a8 100644 --- a/src/Language/AST/Builder/IntBuilder.php +++ b/src/Language/AST/Builder/IntBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\IntValueNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class IntBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/InterfaceTypeDefinitionBuilder.php b/src/Language/AST/Builder/InterfaceTypeDefinitionBuilder.php index 5015f9db..d786a4b9 100644 --- a/src/Language/AST/Builder/InterfaceTypeDefinitionBuilder.php +++ b/src/Language/AST/Builder/InterfaceTypeDefinitionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\InterfaceTypeDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InterfaceTypeDefinitionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/InterfaceTypeExtensionBuilder.php b/src/Language/AST/Builder/InterfaceTypeExtensionBuilder.php index 906924cc..0c581641 100644 --- a/src/Language/AST/Builder/InterfaceTypeExtensionBuilder.php +++ b/src/Language/AST/Builder/InterfaceTypeExtensionBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\InterfaceTypeExtensionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InterfaceTypeExtensionBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/ListBuilder.php b/src/Language/AST/Builder/ListBuilder.php index 1b7a06c8..29ed02c9 100644 --- a/src/Language/AST/Builder/ListBuilder.php +++ b/src/Language/AST/Builder/ListBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\ListValueNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class ListBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/ListTypeBuilder.php b/src/Language/AST/Builder/ListTypeBuilder.php index 94ef16ae..075c04f6 100644 --- a/src/Language/AST/Builder/ListTypeBuilder.php +++ b/src/Language/AST/Builder/ListTypeBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\ListTypeNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class ListTypeBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/NameBuilder.php b/src/Language/AST/Builder/NameBuilder.php index 28e480f5..0a2b2432 100644 --- a/src/Language/AST/Builder/NameBuilder.php +++ b/src/Language/AST/Builder/NameBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\NameNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class NameBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/NamedTypeBuilder.php b/src/Language/AST/Builder/NamedTypeBuilder.php index 6ffc33b3..f8d20729 100644 --- a/src/Language/AST/Builder/NamedTypeBuilder.php +++ b/src/Language/AST/Builder/NamedTypeBuilder.php @@ -2,8 +2,8 @@ namespace Digia\GraphQL\Language\AST\Builder; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\NamedTypeNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class NamedTypeBuilder extends AbstractBuilder diff --git a/src/Language/AST/Builder/OperationTypeDefinitionBuilder.php b/src/Language/AST/Builder/OperationTypeDefinitionBuilder.php index 65de4396..423a0bac 100644 --- a/src/Language/AST/Builder/OperationTypeDefinitionBuilder.php +++ b/src/Language/AST/Builder/OperationTypeDefinitionBuilder.php @@ -15,9 +15,9 @@ class OperationTypeDefinitionBuilder extends AbstractBuilder public function build(array $ast): NodeInterface { return new OperationTypeDefinitionNode([ - 'operation' => $this->get($ast, 'operation'), - 'type' => $this->buildOne($ast, 'type'), - 'location' => $this->createLocation($ast), + 'operation' => $this->get($ast, 'operation'), + 'type' => $this->buildOne($ast, 'type'), + 'location' => $this->createLocation($ast), ]); } diff --git a/src/Language/AST/Builder/ScalarTypeExtensionBuilder.php b/src/Language/AST/Builder/ScalarTypeExtensionBuilder.php index d0bc3639..5a5d8c8c 100644 --- a/src/Language/AST/Builder/ScalarTypeExtensionBuilder.php +++ b/src/Language/AST/Builder/ScalarTypeExtensionBuilder.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Builder; use Digia\GraphQL\Language\AST\Node\NodeInterface; -use Digia\GraphQL\Language\AST\Node\ScalarTypeDefinitionNode; use Digia\GraphQL\Language\AST\Node\ScalarTypeExtensionNode; use Digia\GraphQL\Language\AST\NodeKindEnum; @@ -16,9 +15,9 @@ class ScalarTypeExtensionBuilder extends AbstractBuilder public function build(array $ast): NodeInterface { return new ScalarTypeExtensionNode([ - 'name' => $this->buildOne($ast, 'name'), - 'directives' => $this->buildMany($ast, 'directives'), - 'location' => $this->createLocation($ast), + 'name' => $this->buildOne($ast, 'name'), + 'directives' => $this->buildMany($ast, 'directives'), + 'location' => $this->createLocation($ast), ]); } diff --git a/src/Language/AST/Node/AbstractNode.php b/src/Language/AST/Node/AbstractNode.php index 0bb0c220..8b82b423 100644 --- a/src/Language/AST/Node/AbstractNode.php +++ b/src/Language/AST/Node/AbstractNode.php @@ -3,8 +3,8 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\ConfigObject; -use Digia\GraphQL\SerializationInterface; use Digia\GraphQL\Language\Location; +use Digia\GraphQL\SerializationInterface; use function Digia\GraphQL\Util\jsonEncode; abstract class AbstractNode extends ConfigObject implements SerializationInterface diff --git a/src/Language/AST/Node/AliasTrait.php b/src/Language/AST/Node/AliasTrait.php index b53c398e..b741c2a8 100644 --- a/src/Language/AST/Node/AliasTrait.php +++ b/src/Language/AST/Node/AliasTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\NameNode; - trait AliasTrait { diff --git a/src/Language/AST/Node/ArgumentNode.php b/src/Language/AST/Node/ArgumentNode.php index a14ce4a8..8fed189f 100644 --- a/src/Language/AST/Node/ArgumentNode.php +++ b/src/Language/AST/Node/ArgumentNode.php @@ -2,9 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\ValueLiteralTrait; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class ArgumentNode extends AbstractNode implements NodeInterface diff --git a/src/Language/AST/Node/ArgumentsTrait.php b/src/Language/AST/Node/ArgumentsTrait.php index 46680c5d..37e7b266 100644 --- a/src/Language/AST/Node/ArgumentsTrait.php +++ b/src/Language/AST/Node/ArgumentsTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode; trait ArgumentsTrait { diff --git a/src/Language/AST/Node/BooleanValueNode.php b/src/Language/AST/Node/BooleanValueNode.php index 643d8fff..98ab312e 100644 --- a/src/Language/AST/Node/BooleanValueNode.php +++ b/src/Language/AST/Node/BooleanValueNode.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\ValueTrait; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class BooleanValueNode extends AbstractNode implements ValueNodeInterface diff --git a/src/Language/AST/Node/DefaultValueTrait.php b/src/Language/AST/Node/DefaultValueTrait.php index 927d0632..6b3ee401 100644 --- a/src/Language/AST/Node/DefaultValueTrait.php +++ b/src/Language/AST/Node/DefaultValueTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; trait DefaultValueTrait { diff --git a/src/Language/AST/Node/DescriptionTrait.php b/src/Language/AST/Node/DescriptionTrait.php index ac3fd56c..bdd023c1 100644 --- a/src/Language/AST/Node/DescriptionTrait.php +++ b/src/Language/AST/Node/DescriptionTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\StringValueNode; - trait DescriptionTrait { diff --git a/src/Language/AST/Node/DirectiveDefinitionNode.php b/src/Language/AST/Node/DirectiveDefinitionNode.php index f5cea214..c9a13a61 100644 --- a/src/Language/AST/Node/DirectiveDefinitionNode.php +++ b/src/Language/AST/Node/DirectiveDefinitionNode.php @@ -2,12 +2,8 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\ArgumentsTrait; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; +use Digia\GraphQL\SerializationInterface; class DirectiveDefinitionNode extends AbstractNode implements DefinitionNodeInterface { diff --git a/src/Language/AST/Node/DirectiveNode.php b/src/Language/AST/Node/DirectiveNode.php index 9931ca02..c8cce7f0 100644 --- a/src/Language/AST/Node/DirectiveNode.php +++ b/src/Language/AST/Node/DirectiveNode.php @@ -3,8 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\NodeInterface; class DirectiveNode extends AbstractNode implements NodeInterface { diff --git a/src/Language/AST/Node/DirectivesTrait.php b/src/Language/AST/Node/DirectivesTrait.php index d20158bf..c8226889 100644 --- a/src/Language/AST/Node/DirectivesTrait.php +++ b/src/Language/AST/Node/DirectivesTrait.php @@ -2,9 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\DirectiveNode; - trait DirectivesTrait { diff --git a/src/Language/AST/Node/DocumentNode.php b/src/Language/AST/Node/DocumentNode.php index c73175d6..a365fc9f 100644 --- a/src/Language/AST/Node/DocumentNode.php +++ b/src/Language/AST/Node/DocumentNode.php @@ -2,10 +2,8 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; +use Digia\GraphQL\SerializationInterface; class DocumentNode extends AbstractNode implements NodeInterface { diff --git a/src/Language/AST/Node/EnumTypeDefinitionNode.php b/src/Language/AST/Node/EnumTypeDefinitionNode.php index 07bc6e35..c4c2fbfe 100644 --- a/src/Language/AST/Node/EnumTypeDefinitionNode.php +++ b/src/Language/AST/Node/EnumTypeDefinitionNode.php @@ -3,11 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\EnumValuesTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; class EnumTypeDefinitionNode extends AbstractNode implements DefinitionNodeInterface { diff --git a/src/Language/AST/Node/EnumTypeExtensionNode.php b/src/Language/AST/Node/EnumTypeExtensionNode.php index 3ce46e92..1b9063a3 100644 --- a/src/Language/AST/Node/EnumTypeExtensionNode.php +++ b/src/Language/AST/Node/EnumTypeExtensionNode.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\EnumValuesTrait; -use Digia\GraphQL\Language\AST\Node\TypeExtensionNodeInterface; class EnumTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInterface { @@ -26,11 +22,11 @@ class EnumTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInt public function toArray(): array { return [ - 'kind' => $this->kind, - 'name' => $this->getNameAsArray(), - 'directives' => $this->getDirectivesAsArray(), - 'values' => $this->getValuesAsArray(), - 'loc' => $this->getLocationAsArray(), + 'kind' => $this->kind, + 'name' => $this->getNameAsArray(), + 'directives' => $this->getDirectivesAsArray(), + 'values' => $this->getValuesAsArray(), + 'loc' => $this->getLocationAsArray(), ]; } } diff --git a/src/Language/AST/Node/EnumValueDefinitionNode.php b/src/Language/AST/Node/EnumValueDefinitionNode.php index 4db7cf56..de972090 100644 --- a/src/Language/AST/Node/EnumValueDefinitionNode.php +++ b/src/Language/AST/Node/EnumValueDefinitionNode.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; class EnumValueDefinitionNode extends AbstractNode implements DefinitionNodeInterface { diff --git a/src/Language/AST/Node/EnumValueNode.php b/src/Language/AST/Node/EnumValueNode.php index 4929b415..76a10f4a 100644 --- a/src/Language/AST/Node/EnumValueNode.php +++ b/src/Language/AST/Node/EnumValueNode.php @@ -3,8 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\ValueLiteralTrait; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; class EnumValueNode extends AbstractNode implements ValueNodeInterface { diff --git a/src/Language/AST/Node/EnumValuesTrait.php b/src/Language/AST/Node/EnumValuesTrait.php index eeaba23f..bb09ee30 100644 --- a/src/Language/AST/Node/EnumValuesTrait.php +++ b/src/Language/AST/Node/EnumValuesTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\EnumValueDefinitionNode; trait EnumValuesTrait { diff --git a/src/Language/AST/Node/FieldDefinitionNode.php b/src/Language/AST/Node/FieldDefinitionNode.php index 2a5546ee..10add683 100644 --- a/src/Language/AST/Node/FieldDefinitionNode.php +++ b/src/Language/AST/Node/FieldDefinitionNode.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\ArgumentsTrait; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FieldDefinitionNode extends AbstractNode implements DefinitionNodeInterface diff --git a/src/Language/AST/Node/FieldNode.php b/src/Language/AST/Node/FieldNode.php index 4c11094e..04e3d0f6 100644 --- a/src/Language/AST/Node/FieldNode.php +++ b/src/Language/AST/Node/FieldNode.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\AliasTrait; -use Digia\GraphQL\Language\AST\Node\ArgumentsTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\SelectionSetTrait; -use Digia\GraphQL\Language\AST\Node\SelectionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FieldNode extends AbstractNode implements SelectionNodeInterface diff --git a/src/Language/AST/Node/FieldsTrait.php b/src/Language/AST/Node/FieldsTrait.php index 69aaa3c6..de56ba8a 100644 --- a/src/Language/AST/Node/FieldsTrait.php +++ b/src/Language/AST/Node/FieldsTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\FieldDefinitionNode; trait FieldsTrait { diff --git a/src/Language/AST/Node/FloatValueNode.php b/src/Language/AST/Node/FloatValueNode.php index f4c4e10f..1ae81b1e 100644 --- a/src/Language/AST/Node/FloatValueNode.php +++ b/src/Language/AST/Node/FloatValueNode.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\ValueTrait; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class FloatValueNode extends AbstractNode implements ValueNodeInterface diff --git a/src/Language/AST/Node/FragmentDefinitionNode.php b/src/Language/AST/Node/FragmentDefinitionNode.php index 1437d90e..5426a269 100644 --- a/src/Language/AST/Node/FragmentDefinitionNode.php +++ b/src/Language/AST/Node/FragmentDefinitionNode.php @@ -2,12 +2,7 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\SelectionSetTrait; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeConditionTrait; -use Digia\GraphQL\Language\AST\Node\VariableDefinitionsTrait; -use Digia\GraphQL\Language\AST\Node\ExecutableDefinitionNodeInterface; class FragmentDefinitionNode extends AbstractNode implements ExecutableDefinitionNodeInterface { diff --git a/src/Language/AST/Node/FragmentSpreadNode.php b/src/Language/AST/Node/FragmentSpreadNode.php index 0be72d21..a9d7b465 100644 --- a/src/Language/AST/Node/FragmentSpreadNode.php +++ b/src/Language/AST/Node/FragmentSpreadNode.php @@ -2,11 +2,7 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\SelectionSetTrait; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\NodeInterface; class FragmentSpreadNode extends AbstractNode implements NodeInterface { diff --git a/src/Language/AST/Node/InlineFragmentNode.php b/src/Language/AST/Node/InlineFragmentNode.php index 7cd78e15..752c4bda 100644 --- a/src/Language/AST/Node/InlineFragmentNode.php +++ b/src/Language/AST/Node/InlineFragmentNode.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\SelectionSetTrait; -use Digia\GraphQL\Language\AST\Node\TypeConditionTrait; -use Digia\GraphQL\Language\AST\Node\NodeInterface; class InlineFragmentNode extends AbstractNode implements NodeInterface { diff --git a/src/Language/AST/Node/InputFieldsTrait.php b/src/Language/AST/Node/InputFieldsTrait.php index fb842d9a..68ae0273 100644 --- a/src/Language/AST/Node/InputFieldsTrait.php +++ b/src/Language/AST/Node/InputFieldsTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode; trait InputFieldsTrait { diff --git a/src/Language/AST/Node/InputObjectTypeDefinitionNode.php b/src/Language/AST/Node/InputObjectTypeDefinitionNode.php index da9a75d2..a3478771 100644 --- a/src/Language/AST/Node/InputObjectTypeDefinitionNode.php +++ b/src/Language/AST/Node/InputObjectTypeDefinitionNode.php @@ -3,11 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\InputFieldsTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; class InputObjectTypeDefinitionNode extends AbstractNode implements DefinitionNodeInterface { diff --git a/src/Language/AST/Node/InputObjectTypeExtensionNode.php b/src/Language/AST/Node/InputObjectTypeExtensionNode.php index f15b9f5a..d6c95f55 100644 --- a/src/Language/AST/Node/InputObjectTypeExtensionNode.php +++ b/src/Language/AST/Node/InputObjectTypeExtensionNode.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\InputFieldsTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeExtensionNodeInterface; class InputObjectTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInterface { @@ -26,11 +22,11 @@ class InputObjectTypeExtensionNode extends AbstractNode implements TypeExtension public function toArray(): array { return [ - 'kind' => $this->kind, - 'name' => $this->getNameAsArray(), - 'directives' => $this->getDirectivesAsArray(), - 'fields' => $this->getFieldsAsArray(), - 'loc' => $this->getLocationAsArray(), + 'kind' => $this->kind, + 'name' => $this->getNameAsArray(), + 'directives' => $this->getDirectivesAsArray(), + 'fields' => $this->getFieldsAsArray(), + 'loc' => $this->getLocationAsArray(), ]; } } diff --git a/src/Language/AST/Node/InputValueDefinitionNode.php b/src/Language/AST/Node/InputValueDefinitionNode.php index 022b2aca..c63a8ac8 100644 --- a/src/Language/AST/Node/InputValueDefinitionNode.php +++ b/src/Language/AST/Node/InputValueDefinitionNode.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\DefaultValueTrait; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InputValueDefinitionNode extends AbstractNode implements DefinitionNodeInterface diff --git a/src/Language/AST/Node/IntValueNode.php b/src/Language/AST/Node/IntValueNode.php index ba3dd97e..d761d486 100644 --- a/src/Language/AST/Node/IntValueNode.php +++ b/src/Language/AST/Node/IntValueNode.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\ValueTrait; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class IntValueNode extends AbstractNode implements ValueNodeInterface diff --git a/src/Language/AST/Node/InterfaceTypeDefinitionNode.php b/src/Language/AST/Node/InterfaceTypeDefinitionNode.php index 4c2523bc..6518829a 100644 --- a/src/Language/AST/Node/InterfaceTypeDefinitionNode.php +++ b/src/Language/AST/Node/InterfaceTypeDefinitionNode.php @@ -2,11 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\FieldsTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class InterfaceTypeDefinitionNode extends AbstractNode implements DefinitionNodeInterface diff --git a/src/Language/AST/Node/InterfaceTypeExtensionNode.php b/src/Language/AST/Node/InterfaceTypeExtensionNode.php index d0d61888..ac1f6957 100644 --- a/src/Language/AST/Node/InterfaceTypeExtensionNode.php +++ b/src/Language/AST/Node/InterfaceTypeExtensionNode.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\FieldsTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeExtensionNodeInterface; class InterfaceTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInterface { @@ -26,11 +22,11 @@ class InterfaceTypeExtensionNode extends AbstractNode implements TypeExtensionNo public function toArray(): array { return [ - 'kind' => $this->kind, - 'name' => $this->getNameAsArray(), - 'directives' => $this->getDirectivesAsArray(), - 'fields' => $this->getFieldsAsArray(), - 'loc' => $this->getLocationAsArray(), + 'kind' => $this->kind, + 'name' => $this->getNameAsArray(), + 'directives' => $this->getDirectivesAsArray(), + 'fields' => $this->getFieldsAsArray(), + 'loc' => $this->getLocationAsArray(), ]; } } diff --git a/src/Language/AST/Node/InterfacesTrait.php b/src/Language/AST/Node/InterfacesTrait.php index 9e8da6c0..4227eb07 100644 --- a/src/Language/AST/Node/InterfacesTrait.php +++ b/src/Language/AST/Node/InterfacesTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\NamedTypeNode; trait InterfacesTrait { diff --git a/src/Language/AST/Node/ListTypeNode.php b/src/Language/AST/Node/ListTypeNode.php index a07ff187..8e22e825 100644 --- a/src/Language/AST/Node/ListTypeNode.php +++ b/src/Language/AST/Node/ListTypeNode.php @@ -3,8 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\TypeTrait; -use Digia\GraphQL\Language\AST\Node\TypeNodeInterface; class ListTypeNode extends AbstractNode implements TypeNodeInterface { diff --git a/src/Language/AST/Node/ListValueNode.php b/src/Language/AST/Node/ListValueNode.php index e2c615b8..091b5c78 100644 --- a/src/Language/AST/Node/ListValueNode.php +++ b/src/Language/AST/Node/ListValueNode.php @@ -2,9 +2,8 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; +use Digia\GraphQL\SerializationInterface; class ListValueNode extends AbstractNode implements ValueNodeInterface { diff --git a/src/Language/AST/Node/NameNode.php b/src/Language/AST/Node/NameNode.php index 0a8890cd..47a1411c 100644 --- a/src/Language/AST/Node/NameNode.php +++ b/src/Language/AST/Node/NameNode.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\ValueTrait; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class NameNode extends AbstractNode implements NodeInterface diff --git a/src/Language/AST/Node/NameTrait.php b/src/Language/AST/Node/NameTrait.php index 02563c62..312329a2 100644 --- a/src/Language/AST/Node/NameTrait.php +++ b/src/Language/AST/Node/NameTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\NameNode; - trait NameTrait { diff --git a/src/Language/AST/Node/NamedTypeNode.php b/src/Language/AST/Node/NamedTypeNode.php index d831437c..1b607148 100644 --- a/src/Language/AST/Node/NamedTypeNode.php +++ b/src/Language/AST/Node/NamedTypeNode.php @@ -3,8 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeNodeInterface; class NamedTypeNode extends AbstractNode implements TypeNodeInterface { diff --git a/src/Language/AST/Node/NodeTrait.php b/src/Language/AST/Node/NodeTrait.php index 383caec5..f0727df9 100644 --- a/src/Language/AST/Node/NodeTrait.php +++ b/src/Language/AST/Node/NodeTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\NodeInterface; - trait NodeTrait { diff --git a/src/Language/AST/Node/NonNullTypeNode.php b/src/Language/AST/Node/NonNullTypeNode.php index e2a4e28e..498c7f87 100644 --- a/src/Language/AST/Node/NonNullTypeNode.php +++ b/src/Language/AST/Node/NonNullTypeNode.php @@ -3,8 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\TypeTrait; -use Digia\GraphQL\Language\AST\Node\TypeNodeInterface; class NonNullTypeNode extends AbstractNode implements TypeNodeInterface { diff --git a/src/Language/AST/Node/NullValueNode.php b/src/Language/AST/Node/NullValueNode.php index 557159dd..e8ff24e3 100644 --- a/src/Language/AST/Node/NullValueNode.php +++ b/src/Language/AST/Node/NullValueNode.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; class NullValueNode extends AbstractNode implements ValueNodeInterface { diff --git a/src/Language/AST/Node/ObjectFieldNode.php b/src/Language/AST/Node/ObjectFieldNode.php index 8ff69523..6bfe62f7 100644 --- a/src/Language/AST/Node/ObjectFieldNode.php +++ b/src/Language/AST/Node/ObjectFieldNode.php @@ -3,9 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\ValueLiteralTrait; -use Digia\GraphQL\Language\AST\Node\NodeInterface; class ObjectFieldNode extends AbstractNode implements NodeInterface { diff --git a/src/Language/AST/Node/ObjectTypeDefinitionNode.php b/src/Language/AST/Node/ObjectTypeDefinitionNode.php index f7021a1b..9f65a5c8 100644 --- a/src/Language/AST/Node/ObjectTypeDefinitionNode.php +++ b/src/Language/AST/Node/ObjectTypeDefinitionNode.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\FieldsTrait; -use Digia\GraphQL\Language\AST\Node\InterfacesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeDefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class ObjectTypeDefinitionNode extends AbstractNode implements TypeDefinitionNodeInterface diff --git a/src/Language/AST/Node/ObjectTypeExtensionNode.php b/src/Language/AST/Node/ObjectTypeExtensionNode.php index fd9535f5..183a051d 100644 --- a/src/Language/AST/Node/ObjectTypeExtensionNode.php +++ b/src/Language/AST/Node/ObjectTypeExtensionNode.php @@ -3,11 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\FieldsTrait; -use Digia\GraphQL\Language\AST\Node\InterfacesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeExtensionNodeInterface; class ObjectTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInterface { @@ -28,12 +23,12 @@ class ObjectTypeExtensionNode extends AbstractNode implements TypeExtensionNodeI public function toArray(): array { return [ - 'kind' => $this->kind, - 'name' => $this->getNameAsArray(), - 'interfaces' => $this->getInterfacesAsArray(), - 'directives' => $this->getDirectivesAsArray(), - 'fields' => $this->getFieldsAsArray(), - 'loc' => $this->getLocationAsArray(), + 'kind' => $this->kind, + 'name' => $this->getNameAsArray(), + 'interfaces' => $this->getInterfacesAsArray(), + 'directives' => $this->getDirectivesAsArray(), + 'fields' => $this->getFieldsAsArray(), + 'loc' => $this->getLocationAsArray(), ]; } } diff --git a/src/Language/AST/Node/ObjectValueNode.php b/src/Language/AST/Node/ObjectValueNode.php index 209ed73c..d935f401 100644 --- a/src/Language/AST/Node/ObjectValueNode.php +++ b/src/Language/AST/Node/ObjectValueNode.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; class ObjectValueNode extends AbstractNode implements ValueNodeInterface { diff --git a/src/Language/AST/Node/OperationDefinitionNode.php b/src/Language/AST/Node/OperationDefinitionNode.php index 8145ca1c..c7918b05 100644 --- a/src/Language/AST/Node/OperationDefinitionNode.php +++ b/src/Language/AST/Node/OperationDefinitionNode.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\SelectionSetTrait; -use Digia\GraphQL\Language\AST\Node\VariableDefinitionsTrait; -use Digia\GraphQL\Language\AST\Node\ExecutableDefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class OperationDefinitionNode extends AbstractNode implements ExecutableDefinitionNodeInterface diff --git a/src/Language/AST/Node/OperationTypeDefinitionNode.php b/src/Language/AST/Node/OperationTypeDefinitionNode.php index 8782979d..a613ec25 100644 --- a/src/Language/AST/Node/OperationTypeDefinitionNode.php +++ b/src/Language/AST/Node/OperationTypeDefinitionNode.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\TypeTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class OperationTypeDefinitionNode extends AbstractNode implements DefinitionNodeInterface diff --git a/src/Language/AST/Node/ScalarTypeDefinitionNode.php b/src/Language/AST/Node/ScalarTypeDefinitionNode.php index 1ebecd70..f124509c 100644 --- a/src/Language/AST/Node/ScalarTypeDefinitionNode.php +++ b/src/Language/AST/Node/ScalarTypeDefinitionNode.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeDefinitionNodeInterface; class ScalarTypeDefinitionNode extends AbstractNode implements TypeDefinitionNodeInterface { diff --git a/src/Language/AST/Node/ScalarTypeExtensionNode.php b/src/Language/AST/Node/ScalarTypeExtensionNode.php index f9ffe110..07c4a0b6 100644 --- a/src/Language/AST/Node/ScalarTypeExtensionNode.php +++ b/src/Language/AST/Node/ScalarTypeExtensionNode.php @@ -2,9 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypeExtensionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class ScalarTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInterface diff --git a/src/Language/AST/Node/SchemaDefinitionNode.php b/src/Language/AST/Node/SchemaDefinitionNode.php index c5154684..a8db8dbb 100644 --- a/src/Language/AST/Node/SchemaDefinitionNode.php +++ b/src/Language/AST/Node/SchemaDefinitionNode.php @@ -2,10 +2,8 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\TypeSystemDefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; +use Digia\GraphQL\SerializationInterface; class SchemaDefinitionNode extends AbstractNode implements TypeSystemDefinitionNodeInterface { diff --git a/src/Language/AST/Node/SelectionSetNode.php b/src/Language/AST/Node/SelectionSetNode.php index e7f7df49..a2c941e6 100644 --- a/src/Language/AST/Node/SelectionSetNode.php +++ b/src/Language/AST/Node/SelectionSetNode.php @@ -2,10 +2,8 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\NodeInterface; -use Digia\GraphQL\Language\AST\Node\SelectionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; +use Digia\GraphQL\SerializationInterface; class SelectionSetNode extends AbstractNode implements NodeInterface { diff --git a/src/Language/AST/Node/SelectionSetTrait.php b/src/Language/AST/Node/SelectionSetTrait.php index 0b13d138..d260305d 100644 --- a/src/Language/AST/Node/SelectionSetTrait.php +++ b/src/Language/AST/Node/SelectionSetTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\SelectionSetNode; - trait SelectionSetTrait { diff --git a/src/Language/AST/Node/StringValueNode.php b/src/Language/AST/Node/StringValueNode.php index 36b412f0..649ad884 100644 --- a/src/Language/AST/Node/StringValueNode.php +++ b/src/Language/AST/Node/StringValueNode.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\ValueTrait; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class StringValueNode extends AbstractNode implements ValueNodeInterface diff --git a/src/Language/AST/Node/TypeConditionTrait.php b/src/Language/AST/Node/TypeConditionTrait.php index ee415dec..fcd2a85d 100644 --- a/src/Language/AST/Node/TypeConditionTrait.php +++ b/src/Language/AST/Node/TypeConditionTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\NamedTypeNode; - trait TypeConditionTrait { diff --git a/src/Language/AST/Node/TypeTrait.php b/src/Language/AST/Node/TypeTrait.php index 17142788..dd66c09a 100644 --- a/src/Language/AST/Node/TypeTrait.php +++ b/src/Language/AST/Node/TypeTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\TypeNodeInterface; trait TypeTrait { diff --git a/src/Language/AST/Node/TypesTrait.php b/src/Language/AST/Node/TypesTrait.php index 8624ed29..e3453bb3 100644 --- a/src/Language/AST/Node/TypesTrait.php +++ b/src/Language/AST/Node/TypesTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\NamedTypeNode; trait TypesTrait { diff --git a/src/Language/AST/Node/UnionTypeDefinitionNode.php b/src/Language/AST/Node/UnionTypeDefinitionNode.php index 2d60a0e8..1700569d 100644 --- a/src/Language/AST/Node/UnionTypeDefinitionNode.php +++ b/src/Language/AST/Node/UnionTypeDefinitionNode.php @@ -2,11 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\DescriptionTrait; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypesTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class UnionTypeDefinitionNode extends AbstractNode implements DefinitionNodeInterface diff --git a/src/Language/AST/Node/UnionTypeExtensionNode.php b/src/Language/AST/Node/UnionTypeExtensionNode.php index a1e910e0..98791ef5 100644 --- a/src/Language/AST/Node/UnionTypeExtensionNode.php +++ b/src/Language/AST/Node/UnionTypeExtensionNode.php @@ -2,10 +2,6 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\DirectivesTrait; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\TypesTrait; -use Digia\GraphQL\Language\AST\Node\TypeExtensionNodeInterface; use Digia\GraphQL\Language\AST\NodeKindEnum; class UnionTypeExtensionNode extends AbstractNode implements TypeExtensionNodeInterface diff --git a/src/Language/AST/Node/ValueLiteralTrait.php b/src/Language/AST/Node/ValueLiteralTrait.php index b254bfa6..123bc3ef 100644 --- a/src/Language/AST/Node/ValueLiteralTrait.php +++ b/src/Language/AST/Node/ValueLiteralTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; trait ValueLiteralTrait { diff --git a/src/Language/AST/Node/ValueNodeInterface.php b/src/Language/AST/Node/ValueNodeInterface.php index 7f0de641..6f80f351 100644 --- a/src/Language/AST/Node/ValueNodeInterface.php +++ b/src/Language/AST/Node/ValueNodeInterface.php @@ -4,4 +4,5 @@ interface ValueNodeInterface extends NodeInterface { + } diff --git a/src/Language/AST/Node/VariableDefinitionNode.php b/src/Language/AST/Node/VariableDefinitionNode.php index 4ee2da54..c834617b 100644 --- a/src/Language/AST/Node/VariableDefinitionNode.php +++ b/src/Language/AST/Node/VariableDefinitionNode.php @@ -2,11 +2,7 @@ namespace Digia\GraphQL\Language\AST\Node; -use Digia\GraphQL\Language\AST\Node\NameTrait; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\DefaultValueTrait; -use Digia\GraphQL\Language\AST\Node\DefinitionNodeInterface; -use Digia\GraphQL\Language\AST\Node\TypeNodeInterface; class VariableDefinitionNode extends AbstractNode implements DefinitionNodeInterface { diff --git a/src/Language/AST/Node/VariableDefinitionsTrait.php b/src/Language/AST/Node/VariableDefinitionsTrait.php index e21bf9e3..cc05924a 100644 --- a/src/Language/AST/Node/VariableDefinitionsTrait.php +++ b/src/Language/AST/Node/VariableDefinitionsTrait.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\SerializationInterface; -use Digia\GraphQL\Language\AST\Node\VariableDefinitionNode; trait VariableDefinitionsTrait { diff --git a/src/Language/AST/Node/VariableNode.php b/src/Language/AST/Node/VariableNode.php index 4392dc96..5667b5c4 100644 --- a/src/Language/AST/Node/VariableNode.php +++ b/src/Language/AST/Node/VariableNode.php @@ -3,8 +3,6 @@ namespace Digia\GraphQL\Language\AST\Node; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Language\AST\Node\NameTrait; -use Digia\GraphQL\Language\AST\Node\ValueNodeInterface; class VariableNode extends AbstractNode implements ValueNodeInterface { diff --git a/src/Language/Parser.php b/src/Language/Parser.php index 6a9ee496..61465f00 100644 --- a/src/Language/Parser.php +++ b/src/Language/Parser.php @@ -165,8 +165,8 @@ protected function createLexer(Source $source, array $options): LexerInterface /** * Determines if the next token is of a given kind. * - * @param LexerInterface $lexer - * @param string $kind + * @param LexerInterface $lexer + * @param string $kind * @return bool */ protected function peek(LexerInterface $lexer, string $kind): bool @@ -178,8 +178,8 @@ protected function peek(LexerInterface $lexer, string $kind): bool * If the next token is of the given kind, return true after advancing * the lexer. Otherwise, do not change the parser state and return false. * - * @param LexerInterface $lexer - * @param string $kind + * @param LexerInterface $lexer + * @param string $kind * @return bool * @throws GraphQLError */ @@ -196,8 +196,8 @@ protected function skip(LexerInterface $lexer, string $kind): bool * If the next token is of the given kind, return that token after advancing * the lexer. Otherwise, do not change the parser state and throw an error. * - * @param LexerInterface $lexer - * @param string $kind + * @param LexerInterface $lexer + * @param string $kind * @return Token * @throws GraphQLError */ @@ -214,8 +214,8 @@ protected function expect(LexerInterface $lexer, string $kind): Token } /** - * @param LexerInterface $lexer - * @param string $value + * @param LexerInterface $lexer + * @param string $value * @return Token * @throws GraphQLError */ @@ -235,8 +235,8 @@ protected function expectKeyword(LexerInterface $lexer, string $value): Token * Helper function for creating an error when an unexpected lexed token * is encountered. * - * @param LexerInterface $lexer - * @param Token|null $atToken + * @param LexerInterface $lexer + * @param Token|null $atToken * @return GraphQLError */ protected function unexpected(LexerInterface $lexer, ?Token $atToken = null): GraphQLError @@ -248,7 +248,7 @@ protected function unexpected(LexerInterface $lexer, ?Token $atToken = null): Gr /** * @param LexerInterface $lexer - * @param Token $startToken + * @param Token $startToken * @return array */ protected function createLocation(LexerInterface $lexer, Token $startToken): array @@ -265,10 +265,10 @@ protected function createLocation(LexerInterface $lexer, Token $startToken): arr * and ends with a lex token of closeKind. Advances the parser * to the next lex token after the closing token. * - * @param LexerInterface $lexer - * @param string $openKind - * @param callable $parseFunction - * @param string $closeKind + * @param LexerInterface $lexer + * @param string $openKind + * @param callable $parseFunction + * @param string $closeKind * @return array * @throws GraphQLError */ @@ -291,10 +291,10 @@ protected function any(LexerInterface $lexer, string $openKind, callable $parseF * and ends with a lex token of closeKind. Advances the parser * to the next lex token after the closing token. * - * @param LexerInterface $lexer - * @param string $openKind - * @param callable $parseFunction - * @param string $closeKind + * @param LexerInterface $lexer + * @param string $openKind + * @param callable $parseFunction + * @param string $closeKind * @return array * @throws GraphQLError */ @@ -594,7 +594,7 @@ protected function parseField(LexerInterface $lexer): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ @@ -745,7 +745,7 @@ protected function parseFragmentName(LexerInterface $lexer): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ @@ -855,7 +855,7 @@ protected function parseValueValue(LexerInterface $lexer): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ @@ -877,7 +877,7 @@ protected function parseList(LexerInterface $lexer, bool $isConst): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ @@ -902,7 +902,7 @@ protected function parseObject(LexerInterface $lexer, bool $isConst): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ @@ -925,7 +925,7 @@ protected function parseObjectField(LexerInterface $lexer, bool $isConst): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ @@ -942,7 +942,7 @@ protected function parseDirectives(LexerInterface $lexer, bool $isConst): array /** * @param LexerInterface $lexer - * @param bool $isConst + * @param bool $isConst * @return array * @throws GraphQLError */ diff --git a/src/Language/Reader/BlockStringReader.php b/src/Language/Reader/BlockStringReader.php index c3df84c5..638e8ef7 100644 --- a/src/Language/Reader/BlockStringReader.php +++ b/src/Language/Reader/BlockStringReader.php @@ -3,21 +3,19 @@ namespace Digia\GraphQL\Language\Reader; use Digia\GraphQL\Error\SyntaxError; +use Digia\GraphQL\Language\Token; +use Digia\GraphQL\Language\TokenKindEnum; use function Digia\GraphQL\Language\blockStringValue; use function Digia\GraphQL\Language\charCodeAt; use function Digia\GraphQL\Language\isSourceCharacter; use function Digia\GraphQL\Language\printCharCode; use function Digia\GraphQL\Language\sliceString; -use Digia\GraphQL\Language\Token; -use Digia\GraphQL\Language\TokenKindEnum; /** * Class BlockStringReader * * @package Digia\GraphQL\Language\Reader - * * Reads a block string token from the source file. - * * """("?"?(\\"""|\\(?!=""")|[^"\\]))*""" */ class BlockStringReader extends AbstractReader diff --git a/src/Language/Reader/CommentReader.php b/src/Language/Reader/CommentReader.php index 089dc4ba..eba0d4f5 100644 --- a/src/Language/Reader/CommentReader.php +++ b/src/Language/Reader/CommentReader.php @@ -2,10 +2,10 @@ namespace Digia\GraphQL\Language\Reader; -use function Digia\GraphQL\Language\charCodeAt; -use function Digia\GraphQL\Language\sliceString; use Digia\GraphQL\Language\Token; use Digia\GraphQL\Language\TokenKindEnum; +use function Digia\GraphQL\Language\charCodeAt; +use function Digia\GraphQL\Language\sliceString; class CommentReader extends AbstractReader { diff --git a/src/Language/Reader/NameReader.php b/src/Language/Reader/NameReader.php index 72f600d7..01867159 100644 --- a/src/Language/Reader/NameReader.php +++ b/src/Language/Reader/NameReader.php @@ -2,10 +2,10 @@ namespace Digia\GraphQL\Language\Reader; -use function Digia\GraphQL\Language\charCodeAt; -use function Digia\GraphQL\Language\sliceString; use Digia\GraphQL\Language\Token; use Digia\GraphQL\Language\TokenKindEnum; +use function Digia\GraphQL\Language\charCodeAt; +use function Digia\GraphQL\Language\sliceString; class NameReader extends AbstractReader { diff --git a/src/Language/Reader/NumberReader.php b/src/Language/Reader/NumberReader.php index aa3434e2..f4d5fb7a 100644 --- a/src/Language/Reader/NumberReader.php +++ b/src/Language/Reader/NumberReader.php @@ -3,21 +3,19 @@ namespace Digia\GraphQL\Language\Reader; use Digia\GraphQL\Error\SyntaxError; +use Digia\GraphQL\Language\Token; +use Digia\GraphQL\Language\TokenKindEnum; use function Digia\GraphQL\Language\charCodeAt; use function Digia\GraphQL\Language\isNumber; use function Digia\GraphQL\Language\printCharCode; use function Digia\GraphQL\Language\sliceString; -use Digia\GraphQL\Language\Token; -use Digia\GraphQL\Language\TokenKindEnum; /** * Class NumberReader * * @package Digia\GraphQL\Language\Reader - * * Reads a number token from the source file, either a float * or an int depending on whether a decimal point appears. - * * Int: -?(0|[1-9][0-9]*) * Float: -?(0|[1-9][0-9]*)(\.[0-9]+)?((E|e)(+|-)?[0-9]+)? */ diff --git a/src/Language/Reader/ReaderInterface.php b/src/Language/Reader/ReaderInterface.php index deb8b321..ca5e15db 100644 --- a/src/Language/Reader/ReaderInterface.php +++ b/src/Language/Reader/ReaderInterface.php @@ -2,25 +2,24 @@ namespace Digia\GraphQL\Language\Reader; -use Digia\GraphQL\Language\Source; use Digia\GraphQL\Language\Token; interface ReaderInterface { /** - * @param int $code - * @param int $pos - * @param int $line - * @param int $col - * @param Token $prev + * @param int $code + * @param int $pos + * @param int $line + * @param int $col + * @param Token $prev * @return Token */ public function read(int $code, int $pos, int $line, int $col, Token $prev): Token; /** - * @param int $code - * @param int $pos + * @param int $code + * @param int $pos * @return bool */ public function supportsReader(int $code, int $pos): bool; diff --git a/src/Language/Reader/SpreadReader.php b/src/Language/Reader/SpreadReader.php index 5cc8fd10..7ca37278 100644 --- a/src/Language/Reader/SpreadReader.php +++ b/src/Language/Reader/SpreadReader.php @@ -2,9 +2,9 @@ namespace Digia\GraphQL\Language\Reader; -use function Digia\GraphQL\Language\charCodeAt; use Digia\GraphQL\Language\Token; use Digia\GraphQL\Language\TokenKindEnum; +use function Digia\GraphQL\Language\charCodeAt; class SpreadReader extends AbstractReader { diff --git a/src/Language/Reader/StringReader.php b/src/Language/Reader/StringReader.php index edfa8d1f..5ebcdea5 100644 --- a/src/Language/Reader/StringReader.php +++ b/src/Language/Reader/StringReader.php @@ -3,21 +3,18 @@ namespace Digia\GraphQL\Language\Reader; use Digia\GraphQL\Error\SyntaxError; +use Digia\GraphQL\Language\Token; +use Digia\GraphQL\Language\TokenKindEnum; use function Digia\GraphQL\Language\charCodeAt; -use function Digia\GraphQL\Language\chrUTF8; use function Digia\GraphQL\Language\printCharCode; use function Digia\GraphQL\Language\sliceString; -use Digia\GraphQL\Language\Token; -use Digia\GraphQL\Language\TokenKindEnum; use function Digia\GraphQL\Language\uniCharCode; /** * Class StringReader * * @package Digia\GraphQL\Language\Reader - * * Reads a string token from the source file. - * * "([^"\\\u000A\u000D]|(\\(u[0-9a-fA-F]{4}|["\\/bfnrt])))*" */ class StringReader extends AbstractReader diff --git a/src/Language/blockStringValue.php b/src/Language/blockStringValue.php index b18f2531..1a7b0b5e 100644 --- a/src/Language/blockStringValue.php +++ b/src/Language/blockStringValue.php @@ -18,8 +18,8 @@ function blockStringValue(string $rawString): string $commonIndent = null; for ($i = 1; $i < $lineCount; $i++) { - $line = $lines[$i]; - $indent = leadingWhitespace($line); + $line = $lines[$i]; + $indent = leadingWhitespace($line); if ($indent < mb_strlen($line) && ($commonIndent === null || $indent < $commonIndent)) { $commonIndent = $indent; diff --git a/src/Type/Definition/Argument.php b/src/Type/Definition/Argument.php index 1eeb61ef..50b931de 100644 --- a/src/Type/Definition/Argument.php +++ b/src/Type/Definition/Argument.php @@ -5,10 +5,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\DefaultValueTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\TypeTrait; /** * Class Argument diff --git a/src/Type/Definition/ArgumentsTrait.php b/src/Type/Definition/ArgumentsTrait.php index a3d61df3..b596d006 100644 --- a/src/Type/Definition/ArgumentsTrait.php +++ b/src/Type/Definition/ArgumentsTrait.php @@ -2,7 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\Argument; use function Digia\GraphQL\Type\isAssocArray; use function Digia\GraphQL\Util\invariant; diff --git a/src/Type/Definition/Directive.php b/src/Type/Definition/Directive.php index cc94b34c..1fa3791e 100644 --- a/src/Type/Definition/Directive.php +++ b/src/Type/Definition/Directive.php @@ -3,10 +3,6 @@ namespace Digia\GraphQL\Type\Definition; use Digia\GraphQL\ConfigObject; -use Digia\GraphQL\Type\Definition\ArgumentsTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\DirectiveInterface; class Directive extends ConfigObject implements DirectiveInterface { diff --git a/src/Type/Definition/EnumType.php b/src/Type/Definition/EnumType.php index de5079b1..f76ae9af 100644 --- a/src/Type/Definition/EnumType.php +++ b/src/Type/Definition/EnumType.php @@ -3,16 +3,10 @@ namespace Digia\GraphQL\Type\Definition; use Digia\GraphQL\ConfigObject; -use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\EnumTypeDefinitionNode; +use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\NodeTrait; use Digia\GraphQL\Language\AST\NodeKindEnum; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\InputTypeInterface; -use Digia\GraphQL\Type\Definition\LeafTypeInterface; -use Digia\GraphQL\Type\Definition\OutputTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; use function Digia\GraphQL\Type\isAssocArray; use function Digia\GraphQL\Util\invariant; use function Digia\GraphQL\Util\toString; diff --git a/src/Type/Definition/EnumValue.php b/src/Type/Definition/EnumValue.php index 375c6f22..a98d788f 100644 --- a/src/Type/Definition/EnumValue.php +++ b/src/Type/Definition/EnumValue.php @@ -5,10 +5,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\EnumValueDefinitionNode; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\DeprecationTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\ValueTrait; /** * Class EnumValue diff --git a/src/Type/Definition/Field.php b/src/Type/Definition/Field.php index 40da9859..137a9a9c 100644 --- a/src/Type/Definition/Field.php +++ b/src/Type/Definition/Field.php @@ -4,12 +4,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\ArgumentsTrait; -use Digia\GraphQL\Type\Definition\DeprecationTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\ResolveTrait; -use Digia\GraphQL\Type\Definition\TypeTrait; class Field extends ConfigObject { diff --git a/src/Type/Definition/FieldsTrait.php b/src/Type/Definition/FieldsTrait.php index 18a702be..d6ce9ff3 100644 --- a/src/Type/Definition/FieldsTrait.php +++ b/src/Type/Definition/FieldsTrait.php @@ -2,7 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\Field; use function Digia\GraphQL\Type\isAssocArray; use function Digia\GraphQL\Type\isValidResolver; use function Digia\GraphQL\Type\resolveThunk; @@ -42,7 +41,6 @@ public function addField(Field $field) /** * @param array $fields * @return $this - * * @throws \Exception */ public function addFields(array $fields) diff --git a/src/Type/Definition/InputField.php b/src/Type/Definition/InputField.php index 531aefeb..06c588b2 100644 --- a/src/Type/Definition/InputField.php +++ b/src/Type/Definition/InputField.php @@ -5,10 +5,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\DefaultValueTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\TypeTrait; /** * Class InputField diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php index 3f220375..260faca3 100644 --- a/src/Type/Definition/InputObjectType.php +++ b/src/Type/Definition/InputObjectType.php @@ -21,10 +21,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\InputObjectTypeDefinitionNode; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\InputTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; use function Digia\GraphQL\Type\isAssocArray; use function Digia\GraphQL\Type\resolveThunk; use function Digia\GraphQL\Util\invariant; diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php index b810a7c8..0d0b82e5 100644 --- a/src/Type/Definition/InterfaceType.php +++ b/src/Type/Definition/InterfaceType.php @@ -5,15 +5,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\InterfaceTypeDefinitionNode; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\ExtensionASTNodesTrait; -use Digia\GraphQL\Type\Definition\FieldsTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\ResolveTypeTrait; -use Digia\GraphQL\Type\Definition\AbstractTypeInterface; -use Digia\GraphQL\Type\Definition\CompositeTypeInterface; -use Digia\GraphQL\Type\Definition\NamedTypeInterface; -use Digia\GraphQL\Type\Definition\OutputTypeInterface; /** * Interface Type Definition diff --git a/src/Type/Definition/ListType.php b/src/Type/Definition/ListType.php index db3b66ed..4ac061db 100644 --- a/src/Type/Definition/ListType.php +++ b/src/Type/Definition/ListType.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\OfTypeTrait; -use Digia\GraphQL\Type\Definition\TypeInterface; -use Digia\GraphQL\Type\Definition\WrappingTypeInterface; - class ListType implements TypeInterface, WrappingTypeInterface { diff --git a/src/Type/Definition/NonNullType.php b/src/Type/Definition/NonNullType.php index 6139ddf0..00e1c6a6 100644 --- a/src/Type/Definition/NonNullType.php +++ b/src/Type/Definition/NonNullType.php @@ -2,12 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\OfTypeTrait; -use Digia\GraphQL\Type\Definition\TypeInterface; -use Digia\GraphQL\Type\Definition\WrappingTypeInterface; - class NonNullType implements TypeInterface, WrappingTypeInterface { diff --git a/src/Type/Definition/ObjectType.php b/src/Type/Definition/ObjectType.php index dc485e81..a2613a67 100644 --- a/src/Type/Definition/ObjectType.php +++ b/src/Type/Definition/ObjectType.php @@ -5,15 +5,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\NodeTrait; use Digia\GraphQL\Language\AST\Node\ObjectTypeDefinitionNode; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\ExtensionASTNodesTrait; -use Digia\GraphQL\Type\Definition\FieldsTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\ResolveTrait; -use Digia\GraphQL\Type\Definition\CompositeTypeInterface; -use Digia\GraphQL\Type\Definition\NamedTypeInterface; -use Digia\GraphQL\Type\Definition\OutputTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; use function Digia\GraphQL\Type\resolveThunk; use function Digia\GraphQL\Util\invariant; diff --git a/src/Type/Definition/OfTypeTrait.php b/src/Type/Definition/OfTypeTrait.php index 534c3402..70bad557 100644 --- a/src/Type/Definition/OfTypeTrait.php +++ b/src/Type/Definition/OfTypeTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\TypeInterface; - trait OfTypeTrait { diff --git a/src/Type/Definition/ResolveTypeTrait.php b/src/Type/Definition/ResolveTypeTrait.php index 884286ac..f2a5e25e 100644 --- a/src/Type/Definition/ResolveTypeTrait.php +++ b/src/Type/Definition/ResolveTypeTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\TypeInterface; - trait ResolveTypeTrait { diff --git a/src/Type/Definition/ScalarType.php b/src/Type/Definition/ScalarType.php index 4c06cd05..a7a47225 100644 --- a/src/Type/Definition/ScalarType.php +++ b/src/Type/Definition/ScalarType.php @@ -6,13 +6,6 @@ use Digia\GraphQL\Language\AST\Node\NodeInterface; use Digia\GraphQL\Language\AST\Node\NodeTrait; use Digia\GraphQL\Language\AST\Node\ScalarTypeDefinitionNode; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\InputTypeInterface; -use Digia\GraphQL\Type\Definition\LeafTypeInterface; -use Digia\GraphQL\Type\Definition\NamedTypeInterface; -use Digia\GraphQL\Type\Definition\OutputTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; use function Digia\GraphQL\Util\invariant; /** diff --git a/src/Type/Definition/TypeTrait.php b/src/Type/Definition/TypeTrait.php index 596c70d3..e299183f 100644 --- a/src/Type/Definition/TypeTrait.php +++ b/src/Type/Definition/TypeTrait.php @@ -2,8 +2,6 @@ namespace Digia\GraphQL\Type\Definition; -use Digia\GraphQL\Type\Definition\TypeInterface; - trait TypeTrait { diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php index cc9cf408..aa0d2253 100644 --- a/src/Type/Definition/UnionType.php +++ b/src/Type/Definition/UnionType.php @@ -4,13 +4,6 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\NodeTrait; -use Digia\GraphQL\Type\Definition\DescriptionTrait; -use Digia\GraphQL\Type\Definition\NameTrait; -use Digia\GraphQL\Type\Definition\ResolveTypeTrait; -use Digia\GraphQL\Type\Definition\AbstractTypeInterface; -use Digia\GraphQL\Type\Definition\CompositeTypeInterface; -use Digia\GraphQL\Type\Definition\OutputTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; use function Digia\GraphQL\Type\resolveThunk; use function Digia\GraphQL\Util\invariant; diff --git a/src/Type/Schema.php b/src/Type/Schema.php index 267ecd1f..4b106cf4 100644 --- a/src/Type/Schema.php +++ b/src/Type/Schema.php @@ -5,16 +5,15 @@ use Digia\GraphQL\ConfigObject; use Digia\GraphQL\Language\AST\Node\NodeTrait; use Digia\GraphQL\Language\AST\Node\SchemaDefinitionNode; -use Digia\GraphQL\Type\SchemaInterface; -use Digia\GraphQL\Type\Definition\Argument; use Digia\GraphQL\Type\Definition\AbstractTypeInterface; +use Digia\GraphQL\Type\Definition\Argument; use Digia\GraphQL\Type\Definition\DirectiveInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; -use Digia\GraphQL\Type\Definition\WrappingTypeInterface; use Digia\GraphQL\Type\Definition\InputObjectType; use Digia\GraphQL\Type\Definition\InterfaceType; use Digia\GraphQL\Type\Definition\ObjectType; +use Digia\GraphQL\Type\Definition\TypeInterface; use Digia\GraphQL\Type\Definition\UnionType; +use Digia\GraphQL\Type\Definition\WrappingTypeInterface; use function Digia\GraphQL\Util\invariant; /** diff --git a/src/Type/SchemaInterface.php b/src/Type/SchemaInterface.php index c43e9e0c..c7b81fc1 100644 --- a/src/Type/SchemaInterface.php +++ b/src/Type/SchemaInterface.php @@ -4,11 +4,12 @@ use Digia\GraphQL\Type\Definition\AbstractTypeInterface; use Digia\GraphQL\Type\Definition\NamedTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; use Digia\GraphQL\Type\Definition\ObjectType; +use Digia\GraphQL\Type\Definition\TypeInterface; interface SchemaInterface { + /** * @return ObjectType */ diff --git a/src/Type/definition.php b/src/Type/definition.php index dd2f7774..238b9754 100644 --- a/src/Type/definition.php +++ b/src/Type/definition.php @@ -4,23 +4,21 @@ use Digia\GraphQL\Type\Definition\AbstractTypeInterface; use Digia\GraphQL\Type\Definition\CompositeTypeInterface; -use Digia\GraphQL\Type\Definition\InputTypeInterface; -use Digia\GraphQL\Type\Definition\LeafTypeInterface; -use Digia\GraphQL\Type\Definition\NamedTypeInterface; -use Digia\GraphQL\Type\Definition\OutputTypeInterface; -use Digia\GraphQL\Type\Definition\TypeInterface; -use Digia\GraphQL\Type\Definition\WrappingTypeInterface; +use Digia\GraphQL\Type\Definition\Directive; use Digia\GraphQL\Type\Definition\EnumType; use Digia\GraphQL\Type\Definition\InputObjectType; +use Digia\GraphQL\Type\Definition\InputTypeInterface; use Digia\GraphQL\Type\Definition\InterfaceType; +use Digia\GraphQL\Type\Definition\LeafTypeInterface; use Digia\GraphQL\Type\Definition\ListType; +use Digia\GraphQL\Type\Definition\NamedTypeInterface; use Digia\GraphQL\Type\Definition\NonNullType; use Digia\GraphQL\Type\Definition\ObjectType; +use Digia\GraphQL\Type\Definition\OutputTypeInterface; use Digia\GraphQL\Type\Definition\ScalarType; +use Digia\GraphQL\Type\Definition\TypeInterface; use Digia\GraphQL\Type\Definition\UnionType; -use Digia\GraphQL\Type\Definition\Directive; -use Digia\GraphQL\Type\Definition\DirectiveInterface; -use Digia\GraphQL\Type\Schema; +use Digia\GraphQL\Type\Definition\WrappingTypeInterface; use function Digia\GraphQL\Util\invariant; use function Digia\GraphQL\Util\toString; diff --git a/src/Type/directives.php b/src/Type/directives.php index 3c295789..79341378 100644 --- a/src/Type/directives.php +++ b/src/Type/directives.php @@ -1,9 +1,8 @@ function (NodeInterface $astNode) { - return in_array($astNode->getKind(), [NodeKindEnum::FLOAT, NodeKindEnum::INT]) ? $astNode->getValue() : null; + return in_array($astNode->getKind(), + [NodeKindEnum::FLOAT, NodeKindEnum::INT]) ? $astNode->getValue() : null; }, ]); } @@ -137,14 +138,14 @@ function GraphQLInt(): ScalarType if (!$instance) { $instance = GraphQLScalarType([ - 'name' => TypeNameEnum::INT, - 'description' => + 'name' => TypeNameEnum::INT, + 'description' => 'The `Int` scalar type represents non-fractional signed whole numeric ' . 'values. Int can represent values between -(2^31) and 2^31 - 1.', - 'serialize' => function ($value) { + 'serialize' => function ($value) { return coerceInt($value); }, - 'parseValue' => function ($value) { + 'parseValue' => function ($value) { return coerceInt($value); }, 'parseLiteral' => function (NodeInterface $astNode) { @@ -191,21 +192,22 @@ function GraphQLID(): ScalarType if (!$instance) { $instance = GraphQLScalarType([ - 'name' => TypeNameEnum::ID, - 'description' => + 'name' => TypeNameEnum::ID, + 'description' => 'The `ID` scalar type represents a unique identifier, often used to ' . 'refetch an object or as key for a cache. The ID type appears in a JSON ' . 'response as a String; however, it is not intended to be human-readable. ' . 'When expected as an input type, any string (such as `"4"`) or integer ' . '(such as `4`) input value will be accepted as an ID.', - 'serialize' => function ($value) { + 'serialize' => function ($value) { return coerceString($value); }, - 'parseValue' => function ($value) { + 'parseValue' => function ($value) { return coerceString($value); }, 'parseLiteral' => function (NodeInterface $astNode) { - return in_array($astNode->getKind(), [NodeKindEnum::STRING, NodeKindEnum::INT]) ? $astNode->getValue() : null; + return in_array($astNode->getKind(), + [NodeKindEnum::STRING, NodeKindEnum::INT]) ? $astNode->getValue() : null; }, ]); } @@ -222,15 +224,15 @@ function GraphQLString(): ScalarType if (!$instance) { $instance = GraphQLScalarType([ - 'name' => TypeNameEnum::STRING, - 'description' => + 'name' => TypeNameEnum::STRING, + 'description' => 'The `String` scalar type represents textual data, represented as UTF-8 ' . 'character sequences. The String type is most often used by GraphQL to ' . 'represent free-form human-readable text.', - 'serialize' => function ($value) { + 'serialize' => function ($value) { return coerceString($value); }, - 'parseValue' => function ($value) { + 'parseValue' => function ($value) { return coerceString($value); }, 'parseLiteral' => function (NodeInterface $astNode) { diff --git a/tests/Functional/Execution/ExecutionTest.php b/tests/Functional/Execution/ExecutionTest.php index 00acfb71..a5d9c918 100644 --- a/tests/Functional/Execution/ExecutionTest.php +++ b/tests/Functional/Execution/ExecutionTest.php @@ -13,12 +13,12 @@ use Digia\GraphQL\Language\AST\Node\StringValueNode; use Digia\GraphQL\Language\AST\NodeKindEnum; use Digia\GraphQL\Language\Location; -use function Digia\GraphQL\Language\parser; use Digia\GraphQL\Language\Source; use Digia\GraphQL\Language\SourceLocation; use Digia\GraphQL\Test\TestCase; use Digia\GraphQL\Type\Definition\ObjectType; use Digia\GraphQL\Type\Schema; +use function Digia\GraphQL\Language\parser; use function Digia\GraphQL\Type\GraphQLInt; use function Digia\GraphQL\Type\GraphQLList; use function Digia\GraphQL\Type\GraphQLString; @@ -49,15 +49,15 @@ public function testExecuteHelloQuery() $documentNode = new DocumentNode([ 'definitions' => [ new OperationDefinitionNode([ - 'kind' => NodeKindEnum::OPERATION_DEFINITION, - 'name' => new NameNode([ + 'kind' => NodeKindEnum::OPERATION_DEFINITION, + 'name' => new NameNode([ 'value' => 'query', ]), - 'selectionSet' => new SelectionSetNode([ + 'selectionSet' => new SelectionSetNode([ 'selections' => [ new FieldNode([ - 'name' => new NameNode([ - 'value' => 'hello', + 'name' => new NameNode([ + 'value' => 'hello', 'location' => new Location( 15, 20, @@ -68,8 +68,8 @@ public function testExecuteHelloQuery() ]) ] ]), - 'operation' => 'query', - 'directives' => [], + 'operation' => 'query', + 'directives' => [], 'variableDefinitions' => [] ]) ], @@ -120,27 +120,28 @@ public function testExecuteQueryHelloWithArgs() $documentNode = new DocumentNode([ 'definitions' => [ new OperationDefinitionNode([ - 'kind' => NodeKindEnum::OPERATION_DEFINITION, - 'name' => new NameNode([ + 'kind' => NodeKindEnum::OPERATION_DEFINITION, + 'name' => new NameNode([ 'value' => 'query' ]), - 'selectionSet' => new SelectionSetNode([ + 'selectionSet' => new SelectionSetNode([ 'selections' => [ new FieldNode([ - 'name' => new NameNode([ - 'value' => 'greeting', + 'name' => new NameNode([ + 'value' => 'greeting', 'location' => new Location( 15, 20, - new Source('query Hello($name: String) {greeting(name: $name)}', 'GraphQL', new SourceLocation()) + new Source('query Hello($name: String) {greeting(name: $name)}', 'GraphQL', + new SourceLocation()) ) ]), 'arguments' => [ new InputValueDefinitionNode([ - 'name' => new NameNode([ + 'name' => new NameNode([ 'value' => 'name' ]), - 'type' => GraphQLString(), + 'type' => GraphQLString(), 'defaultValue' => new StringValueNode([ 'value' => 'Han Solo', ]), @@ -149,8 +150,8 @@ public function testExecuteQueryHelloWithArgs() ]) ] ]), - 'operation' => 'query', - 'directives' => [], + 'operation' => 'query', + 'directives' => [], 'variableDefinitions' => [] ]) ], @@ -189,32 +190,32 @@ public function testExecuteQueryWithMultipleFields() new ObjectType([ 'name' => 'Human', 'fields' => [ - 'id' => [ + 'id' => [ 'type' => GraphQLInt(), 'resolve' => function () { return 1000; } ], - 'type' => [ + 'type' => [ 'type' => GraphQLString(), 'resolve' => function () { return 'Human'; } ], - 'friends' => [ + 'friends' => [ 'type' => GraphQLList(GraphQLString()), 'resolve' => function () { return ['1002', '1003', '2000', '2001']; } ], - 'appearsIn' => [ - 'type' => GraphQLList(GraphQLInt()), + 'appearsIn' => [ + 'type' => GraphQLList(GraphQLInt()), 'resolve' => function () { return [4, 5, 6]; } ], 'homePlanet' => [ - 'type' => GraphQLString(), + 'type' => GraphQLString(), 'resolve' => function () { return 'Tatooine'; } @@ -226,66 +227,71 @@ public function testExecuteQueryWithMultipleFields() $documentNode = new DocumentNode([ 'definitions' => [ new OperationDefinitionNode([ - 'kind' => NodeKindEnum::OPERATION_DEFINITION, - 'name' => new NameNode([ + 'kind' => NodeKindEnum::OPERATION_DEFINITION, + 'name' => new NameNode([ 'value' => 'query' ]), - 'selectionSet' => new SelectionSetNode([ + 'selectionSet' => new SelectionSetNode([ 'selections' => [ new FieldNode([ 'name' => new NameNode([ - 'value' => 'id', + 'value' => 'id', 'location' => new Location( 15, 20, - new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', new SourceLocation()) + new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', + new SourceLocation()) ) ]), ]), new FieldNode([ 'name' => new NameNode([ - 'value' => 'type', + 'value' => 'type', 'location' => new Location( 15, 20, - new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', new SourceLocation()) + new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', + new SourceLocation()) ) ]), ]), new FieldNode([ 'name' => new NameNode([ - 'value' => 'friends', + 'value' => 'friends', 'location' => new Location( 15, 20, - new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', new SourceLocation()) + new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', + new SourceLocation()) ) ]), ]), new FieldNode([ 'name' => new NameNode([ - 'value' => 'appearsIn', + 'value' => 'appearsIn', 'location' => new Location( 15, 20, - new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', new SourceLocation()) + new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', + new SourceLocation()) ) ]), ]), new FieldNode([ 'name' => new NameNode([ - 'value' => 'homePlanet', + 'value' => 'homePlanet', 'location' => new Location( 15, 20, - new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', new SourceLocation()) + new Source('query Human {id, type, friends, appearsIn, homePlanet}', 'GraphQL', + new SourceLocation()) ) ]), ]) ] ]), - 'operation' => 'query', - 'directives' => [], + 'operation' => 'query', + 'directives' => [], 'variableDefinitions' => [] ]) ], @@ -312,7 +318,7 @@ public function testExecuteQueryWithMultipleFields() 'id' => 1000, 'type' => 'Human', 'friends' => ['1002', '1003', '2000', '2001'], - 'appearsIn' => [4,5,6], + 'appearsIn' => [4, 5, 6], 'homePlanet' => 'Tatooine' ], []); @@ -340,7 +346,7 @@ public function testHandleFragments() $Type = new ObjectType([ 'name' => 'Type', - 'fields' => function() use (&$Type) { + 'fields' => function () use (&$Type) { return [ 'a' => [ 'type' => GraphQLString(), diff --git a/tests/Functional/Execution/MutationTest.php b/tests/Functional/Execution/MutationTest.php index cdcc1ff4..682b9003 100644 --- a/tests/Functional/Execution/MutationTest.php +++ b/tests/Functional/Execution/MutationTest.php @@ -5,10 +5,10 @@ use Digia\GraphQL\Execution\Execution; use Digia\GraphQL\Execution\ExecutionResult; use Digia\GraphQL\Language\AST\Node\DocumentNode; -use function Digia\GraphQL\Language\parser; use Digia\GraphQL\Language\Source; use Digia\GraphQL\Test\TestCase; use Digia\GraphQL\Type\Definition\ObjectType; +use function Digia\GraphQL\Language\parser; use function Digia\GraphQL\Type\GraphQLSchema; use function Digia\GraphQL\Type\GraphQLString; @@ -27,7 +27,7 @@ public function testSimpleMutation() 'fields' => [ 'greeting' => [ 'type' => new ObjectType([ - 'name' => 'GreetingType', + 'name' => 'GreetingType', 'fields' => [ 'message' => [ 'type' => GraphQLString(), @@ -108,28 +108,26 @@ public function testDoesNotIncludeIllegalFieldsInOutput() ]); $schema = GraphQLSchema([ - 'query' => new ObjectType([ - 'name' => 'Q', + 'query' => new ObjectType([ + 'name' => 'Q', 'fields' => [ 'a' => ['type' => GraphQLString()], ] ]), 'mutation' => new ObjectType([ - 'name' => 'M', + 'name' => 'M', 'fields' => [ 'c' => ['type' => GraphQLString()], ] ]) ]); - $rootValue = []; $contextValue = ''; $variableValues = []; $operationName = 'M'; $fieldResolver = null; - /** @var ExecutionResult $executionResult */ $executionResult = Execution::execute( $schema, diff --git a/tests/Functional/Type/DefinitionTest.php b/tests/Functional/Type/DefinitionTest.php index d231d3fd..b2b88429 100644 --- a/tests/Functional/Type/DefinitionTest.php +++ b/tests/Functional/Type/DefinitionTest.php @@ -3,7 +3,6 @@ namespace Digia\GraphQL\Type; use Digia\GraphQL\Test\TestCase; -use Digia\GraphQL\Type\Definition\TypeInterface; use Digia\GraphQL\Type\Definition\EnumType; use Digia\GraphQL\Type\Definition\EnumValue; use Digia\GraphQL\Type\Definition\InputObjectType; @@ -11,9 +10,9 @@ use Digia\GraphQL\Type\Definition\ListType; use Digia\GraphQL\Type\Definition\ObjectType; use Digia\GraphQL\Type\Definition\ScalarType; +use Digia\GraphQL\Type\Definition\TypeInterface; use Digia\GraphQL\Type\Definition\TypeNameEnum; use Digia\GraphQL\Type\Definition\UnionType; -use Digia\GraphQL\Type\Schema; class DefinitionTest extends TestCase { diff --git a/tests/Functional/Type/EnumTypeTest.php b/tests/Functional/Type/EnumTypeTest.php index 05cf6a08..e757a886 100644 --- a/tests/Functional/Type/EnumTypeTest.php +++ b/tests/Functional/Type/EnumTypeTest.php @@ -5,13 +5,13 @@ use Digia\GraphQL\Test\TestCase; use Digia\GraphQL\Type\Definition\EnumType; use Digia\GraphQL\Type\Definition\ObjectType; +use Digia\GraphQL\Type\Schema; use function Digia\GraphQL\Type\GraphQLBoolean; use function Digia\GraphQL\Type\GraphQLEnumType; use function Digia\GraphQL\Type\GraphQLInt; use function Digia\GraphQL\Type\GraphQLObjectType; use function Digia\GraphQL\Type\GraphQLSchema; use function Digia\GraphQL\Type\GraphQLString; -use Digia\GraphQL\Type\Schema; class EnumTypeTest extends TestCase { diff --git a/tests/Functional/Type/PredicateTest.php b/tests/Functional/Type/PredicateTest.php index b85b6366..82f4c633 100644 --- a/tests/Functional/Type/PredicateTest.php +++ b/tests/Functional/Type/PredicateTest.php @@ -3,14 +3,14 @@ namespace Digia\GraphQL\Test\Functional\Type; use Digia\GraphQL\Test\TestCase; -use function Digia\GraphQL\Type\assertScalarType; -use function Digia\GraphQL\Type\assertType; use Digia\GraphQL\Type\Definition\EnumType; use Digia\GraphQL\Type\Definition\InputObjectType; use Digia\GraphQL\Type\Definition\InterfaceType; use Digia\GraphQL\Type\Definition\ObjectType; use Digia\GraphQL\Type\Definition\ScalarType; use Digia\GraphQL\Type\Definition\UnionType; +use function Digia\GraphQL\Type\assertScalarType; +use function Digia\GraphQL\Type\assertType; use function Digia\GraphQL\Type\GraphQLEnumType; use function Digia\GraphQL\Type\GraphQLInputObjectType; use function Digia\GraphQL\Type\GraphQLInterfaceType; diff --git a/tests/Functional/Type/SchemaTest.php b/tests/Functional/Type/SchemaTest.php index 06df993b..ac88db01 100644 --- a/tests/Functional/Type/SchemaTest.php +++ b/tests/Functional/Type/SchemaTest.php @@ -3,10 +3,11 @@ namespace Digia\GraphQL\Test\Functional\Type; use Digia\GraphQL\Test\TestCase; +use Digia\GraphQL\Type\Definition\DirectiveInterface; use Digia\GraphQL\Type\Definition\InputObjectType; use Digia\GraphQL\Type\Definition\InterfaceType; use Digia\GraphQL\Type\Definition\ObjectType; -use Digia\GraphQL\Type\Definition\DirectiveInterface; +use Digia\GraphQL\Type\Schema; use function Digia\GraphQL\Type\GraphQLDirective; use function Digia\GraphQL\Type\GraphQLInputObjectType; use function Digia\GraphQL\Type\GraphQLInterfaceType; @@ -14,7 +15,6 @@ use function Digia\GraphQL\Type\GraphQLObjectType; use function Digia\GraphQL\Type\GraphQLSchema; use function Digia\GraphQL\Type\GraphQLString; -use Digia\GraphQL\Type\Schema; class SchemaTest extends TestCase { @@ -97,7 +97,7 @@ public function setUp() $this->directive = GraphQLDirective([ 'name' => 'dir', 'locations' => ['OBJECT'], - 'args' => [ + 'args' => [ 'arg' => [ 'type' => $this->directiveInputType, ], @@ -113,7 +113,7 @@ public function setUp() ]); $this->schema = GraphQLSchema([ - 'query' => GraphQLObjectType([ + 'query' => GraphQLObjectType([ 'name' => 'Query', 'fields' => [ 'getObject' => [