From a6a4f7862b8a4c3662334238140031c17c67fb18 Mon Sep 17 00:00:00 2001 From: vladar Date: Sat, 30 Apr 2016 23:25:09 +0600 Subject: [PATCH] Several validator fixes --- src/Validator/Rules/DefaultValuesOfCorrectType.php | 8 +++++--- src/Validator/Rules/UniqueArgumentNames.php | 3 ++- src/Validator/Rules/UniqueFragmentNames.php | 2 +- src/Validator/Rules/UniqueOperationNames.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Validator/Rules/DefaultValuesOfCorrectType.php b/src/Validator/Rules/DefaultValuesOfCorrectType.php index 22961b7..4bc6785 100644 --- a/src/Validator/Rules/DefaultValuesOfCorrectType.php +++ b/src/Validator/Rules/DefaultValuesOfCorrectType.php @@ -6,9 +6,9 @@ use GraphQL\Error; use GraphQL\Language\AST\Node; use GraphQL\Language\AST\VariableDefinition; use GraphQL\Language\Printer; +use GraphQL\Language\Visitor; use GraphQL\Type\Definition\NonNull; use GraphQL\Validator\DocumentValidator; -use GraphQL\Validator\Messages; use GraphQL\Validator\ValidationContext; class DefaultValuesOfCorrectType @@ -49,8 +49,10 @@ class DefaultValuesOfCorrectType )); } } - return null; - } + return Visitor::skipNode(); + }, + Node::SELECTION_SET => function() {return Visitor::skipNode();}, + Node::FRAGMENT_DEFINITION => function() {return Visitor::skipNode();} ]; } } diff --git a/src/Validator/Rules/UniqueArgumentNames.php b/src/Validator/Rules/UniqueArgumentNames.php index 84cb157..375f5ce 100644 --- a/src/Validator/Rules/UniqueArgumentNames.php +++ b/src/Validator/Rules/UniqueArgumentNames.php @@ -4,6 +4,7 @@ namespace GraphQL\Validator\Rules; use GraphQL\Error; use GraphQL\Language\AST\Argument; use GraphQL\Language\AST\Node; +use GraphQL\Language\Visitor; use GraphQL\Validator\ValidationContext; class UniqueArgumentNames @@ -36,7 +37,7 @@ class UniqueArgumentNames } else { $this->knownArgNames[$argName] = $node->name; } - return false; + return Visitor::skipNode(); } ]; } diff --git a/src/Validator/Rules/UniqueFragmentNames.php b/src/Validator/Rules/UniqueFragmentNames.php index 6dd65eb..300912f 100644 --- a/src/Validator/Rules/UniqueFragmentNames.php +++ b/src/Validator/Rules/UniqueFragmentNames.php @@ -35,7 +35,7 @@ class UniqueFragmentNames } else { $this->knownFragmentNames[$fragmentName] = $node->name; } - return false; + return Visitor::skipNode(); } ]; } diff --git a/src/Validator/Rules/UniqueOperationNames.php b/src/Validator/Rules/UniqueOperationNames.php index e8f8f8e..618bc23 100644 --- a/src/Validator/Rules/UniqueOperationNames.php +++ b/src/Validator/Rules/UniqueOperationNames.php @@ -34,7 +34,7 @@ class UniqueOperationNames $this->knownOperationNames[$operationName->value] = $operationName; } } - return false; + return Visitor::skipNode(); }, Node::FRAGMENT_DEFINITION => function() { return Visitor::skipNode();