fixed variable validator + added proper arguments handling

fixed variables in nested fields and queries don't work #12
youshido-php · Jul 13, 2016 · a948211 · a948211
1 parent ea66d00
commit a948211
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/Execution/Processor.php b/src/Execution/Processor.php
@@ -260,7 +260,13 @@ protected function getPreResolvedValue($contextValue, FieldAst $fieldAst, Abstra
         if ($resolveFunction = $field->getConfig()->getResolveFunction()) {
             $resolveInfo = new ResolveInfo($field, [$fieldAst], $field->getType(), $this->executionContext);
 
-            $resolverValue = $resolveFunction($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
+            if (!$this->resolveValidator->validateArguments($field, $fieldAst, $this->executionContext->getRequest())) {
+                throw new \Exception(sprintf('Not valid arguments for the field "%s"', $fieldAst->getName()));
+
+            } else {
+                $resolverValue = $resolveFunction($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
+            }
+
         }
 
         if (!$resolverValue && !$resolved) {

diff --git a/src/Parser/Ast/ArgumentValue/Variable.php b/src/Parser/Ast/ArgumentValue/Variable.php
@@ -41,7 +41,7 @@ public function __construct($name, $type, $required = false, $isArray = false)
     public function getValue()
     {
         if (!$this->value) {
-            throw new \LogicException('Value not set to variable else');
+            throw new \LogicException('Value is not set for variable "' . $this->name . '"');
         }
 
         return $this->value;

diff --git a/src/Validator/ResolveValidator/ResolveValidatorInterface.php b/src/Validator/ResolveValidator/ResolveValidatorInterface.php
@@ -10,14 +10,15 @@
 
 use Youshido\GraphQL\Execution\Request;
 use Youshido\GraphQL\Field\AbstractField;
+use Youshido\GraphQL\Parser\Ast\Field;
 use Youshido\GraphQL\Parser\Ast\Query;
 
 interface ResolveValidatorInterface
 {
 
     /**
      * @param $field     AbstractField
-     * @param $query     Query
+     * @param $query     Query|Field
      * @param $request   Request
      *
      * @return bool