Updated to latest version of graphql-js

Author: vladar

src/Executor/ExecutionContext.php

@@ -1,6 +1,7 @@
 <?php
 namespace GraphQL\Executor;
 
+use GraphQL\Error;
 use GraphQL\Language\AST\OperationDefinition;
 use GraphQL\Schema;
 
@@ -25,7 +26,7 @@ class ExecutionContext
     /**
      * @var
      */
-    public $root;
+    public $rootValue;
 
     /**
      * @var OperationDefinition
@@ -35,7 +36,7 @@ class ExecutionContext
     /**
      * @var array
      */
-    public $variables;
+    public $variableValues;
 
     /**
      * @var array
@@ -46,13 +47,13 @@ public function __construct($schema, $fragments, $root, $operation, $variables,
     {
         $this->schema = $schema;
         $this->fragments = $fragments;
-        $this->root = $root;
+        $this->rootValue = $root;
         $this->operation = $operation;
-        $this->variables = $variables;
+        $this->variableValues = $variables;
         $this->errors = $errors ?: [];
     }
 
-    public function addError($error)
+    public function addError(Error $error)
     {
         $this->errors[] = $error;
         return $this;

src/Executor/ExecutionResult.php

@@ -0,0 +1,38 @@
+<?php
+namespace GraphQL\Executor;
+
+use GraphQL\Error;
+
+class ExecutionResult
+{
+    /**
+     * @var array
+     */
+    public $data;
+
+    /**
+     * @var Error[]
+     */
+    public $errors;
+
+    /**
+     * @param array $data
+     * @param array $errors
+     */
+    public function __construct(array $data = null, array $errors = [])
+    {
+        $this->data = $data;
+        $this->errors = $errors;
+    }
+
+    public function toArray()
+    {
+        $result = ['data' => $this->data];
+
+        if (!empty($this->errors)) {
+            $result['errors'] = array_map(['GraphQL\Error', 'formatError'], $this->errors);
+        }
+
+        return $result;
+    }
+}