unify internal error handling of parser, validator and executor

Author: joonlabs

src/Execution/Executor.php

@@ -68,7 +68,7 @@ public function collectFields(ExecutionContext $executionContext, GraphQLObjectT
                 case "Field":
                     // check field
                     if (!$this->shouldIncludeNode($executionContext, $selection)) {
-                        continue;
+                        break;
                     }
                     $name = $this->getFieldEntryKey($selection);
                     if (!($fields[$name] ?? null)) {
@@ -79,7 +79,7 @@ public function collectFields(ExecutionContext $executionContext, GraphQLObjectT
                 case "InlineFragment":
                     if (!$this->shouldIncludeNode($executionContext, $selection)
                         || !$this->doesFragmentConditionMatch($executionContext, $selection, $runtimeType)) {
-                        continue;
+                        break;
                     }
                     $this->collectFields(
                         $executionContext,
@@ -92,12 +92,12 @@ public function collectFields(ExecutionContext $executionContext, GraphQLObjectT
                 case "FragmentSpread":
                     $fragName = $selection["name"]["value"];
                     if (array_key_exists($fragName, $visitedFragmentNames) || !$this->shouldIncludeNode($executionContext, $selection)) {
-                        continue;
+                        break;
                     }
                     $visitedFragmentNames[$fragName] = true;
                     $fragment = $executionContext->getFragments()[$fragName];
                     if (!$fragment || !$this->doesFragmentConditionMatch($executionContext, $fragment, $runtimeType)) {
-                        continue;
+                        break;
                     }
                     $this->collectFields(
                         $executionContext,
@@ -178,7 +178,7 @@ public function executeFields(ExecutionContext $executionContext, GraphQLObjectT
             );
 
             if ($result === null) {
-                return $results;
+                //return $results;
             }
 
             $results[$responseName] = $result;

src/Parser/Parser.php

@@ -3,19 +3,23 @@
 namespace GraphQL\Parser;
 
 use GraphQL\Errors\BadUserInputError;
+use GraphQL\Errors\GraphQLError;
 use GraphQL\Errors\UnexpectedEndOfInputError;
 use GraphQL\Errors\UnexpectedTokenError;
 
 class Parser
 {
     private $tokenizer;
     private $string = "";
+    private $document;
     private $lookahead;
+    private $errors;
 
     public function __construct()
     {
         $this->string = "";
         $this->tokenizer = new Tokenizer();
+        $this->errors = [];
     }
 
     /**
@@ -36,8 +40,37 @@ public function parse($string)
 
         $this->lookahead = $this->tokenizer->getNextToken();
 
-        // entry point for parsing
-        return $this->Document();
+        // try parsing the document -> if it fails, add error to the errors
+        try{
+            // entry point for parsing
+            $this->document = $this->Document();
+        }catch (GraphQLError $error){
+            $this->errors[] = $error;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function queryIsValid() : bool
+    {
+        return count($this->errors) === 0;
+    }
+
+    /**
+     * @return array
+     */
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+
+    /**
+     * @return array
+     */
+    public function getParsedDocument(): array
+    {
+        return $this->document;
     }
 
     /***

src/Servers/Server.php

@@ -5,7 +5,6 @@
 use GraphQL\Execution\Executor;
 use GraphQL\Parser\Parser;
 use GraphQL\Schemas\Schema;
-use GraphQL\Errors\GraphQLError;
 use GraphQL\Errors\InternalServerError;
 use GraphQL\Utilities\Errors;
 use GraphQL\Validation\Rules\ValidationRule;
@@ -68,29 +67,35 @@ public function listen()
         } else {
             // try to parse the query
             try {
-                // parse the query
-                $document = $this->parser->parse($query);
+                // parse query
+                $this->parser->parse($query);
 
-                // validate the query
-                $this->validator->validate($this->schema, $document);
+                // check if is valid
+                if(!$this->parser->queryIsValid()){
+                    // if invalid -> show errors
+                    $this->returnData([
+                        "errors" => Errors::prettyPrintErrors($this->parser->getErrors())
+                    ]);
+                    return;
+                }
+
+                // validate query
+                $this->validator->validate($this->schema, $this->parser->getParsedDocument());
 
-                // check if query is valid
+                // check if is valid
                 if (!$this->validator->documentIsValid()) {
                     // if invalid -> show errors
                     $this->returnData([
                         "errors" => Errors::prettyPrintErrors($this->validator->getErrors())
                     ]);
-                } else {
-                    // valid -> execute query
-                    $result = $this->executor->execute($this->schema, $document, null, null, $variables);
-                    $this->returnData($result);
+                    return;
                 }
 
-            } catch (GraphQLError $graphQLError) {
-                // GraphQLError (while parsing or execution) -> error
-                $this->returnData([
-                    "errors" => Errors::prettyPrintErrors([$graphQLError])
-                ]);
+
+                // execute query
+                $result = $this->executor->execute($this->schema, $this->parser->getParsedDocument(), null, null, $variables);
+                $this->returnData($result);
+
             } catch (\Error $error) {
                 // 500 error -> error
                 $this->returnData([

src/Validation/Validator.php

@@ -38,9 +38,9 @@ class Validator
      * Takes a schema and a parsed document and validates them against each other.
      * @param Schema $schema
      * @param array $document
-     * @return array
+     * @return void
      */
-    public function validate(Schema $schema, array $document)
+    public function validate(Schema $schema, array $document) : void
     {
         // create validation context
         $validationContext = new ValidationContext($schema, $document);