Merge 4d6b93f into c6ed3ed

src/Error/GraphQLException.php

@@ -214,10 +214,14 @@ public function toArray(): array
     {
         $result = [
             'message'   => $this->message,
+            // TODO: Do not include `locations` if `null` (similar to `path` and `extensions`).
             'locations' => $this->getLocationsAsArray(),
-            'path'      => $this->path,
         ];
 
+        if (null !== $this->path) {
+            $result['path'] = $this->path;
+        }
+
         if (null !== $this->extensions) {
             $result['extensions'] = $this->extensions;
         }

src/Execution/Execution.php

@@ -48,10 +48,9 @@ public function execute(
             return resolve(new ExecutionResult(null, [$error]));
         }
 
-        $valuesResolver = new ValuesResolver();
-        $fieldCollector = new FieldCollector($context, $valuesResolver);
+        $fieldCollector = new FieldCollector($context);
 
-        $data = $this->executeOperation($operationName, $context, $fieldCollector, $valuesResolver);
+        $data = $this->executeOperation($operationName, $context, $fieldCollector);
 
         if ($data instanceof PromiseInterface) {
             return $data->then(function ($resolvedData) use ($context) {
@@ -72,18 +71,16 @@ public function execute(
      * @param null|string      $operationName
      * @param ExecutionContext $context
      * @param FieldCollector   $fieldCollector
-     * @param ValuesResolver   $valuesResolver
      * @return array|mixed|null|PromiseInterface
      */
     protected function executeOperation(
         ?string $operationName,
         ExecutionContext $context,
-        FieldCollector $fieldCollector,
-        ValuesResolver $valuesResolver
+        FieldCollector $fieldCollector
     ) {
         $strategy = $operationName === 'mutation'
-            ? new SerialExecutionStrategy($context, $fieldCollector, $valuesResolver)
-            : new ParallelExecutionStrategy($context, $fieldCollector, $valuesResolver);
+            ? new SerialExecutionStrategy($context, $fieldCollector)
+            : new ParallelExecutionStrategy($context, $fieldCollector);
 
         $result = null;
 
@@ -100,7 +97,7 @@ protected function executeOperation(
         if ($result instanceof PromiseInterface) {
             return $result->then(null, function (ExecutionException $exception) use ($context) {
                 $context->addError($exception);
-                return \React\Promise\resolve(null);
+                return resolve(null);
             });
         }
 
@@ -161,7 +158,7 @@ protected function createContext(
             throw new ExecutionException('Must provide an operation.');
         }
 
-        $coercedVariableValues = (new ValuesResolver())->coerceVariableValues(
+        $coercedVariableValues = ValuesResolver::coerceVariableValues(
             $schema,
             $operation->getVariableDefinitions(),
             $rawVariableValues

src/Execution/Strategy/AbstractExecutionStrategy.php

@@ -42,11 +42,6 @@ abstract class AbstractExecutionStrategy implements ExecutionStrategyInterface
      */
     protected $fieldCollector;
 
-    /**
-     * @var ValuesResolver
-     */
-    protected $valuesResolver;
-
     /**
      * @var callable
      */
@@ -73,20 +68,17 @@ abstract public function executeFields(ObjectType $parentType, $rootValue, array
      *
      * @param ExecutionContext $context
      * @param FieldCollector   $fieldCollector
-     * @param ValuesResolver   $valueResolver
      * @param callable|null    $typeResolverCallback
      * @param callable|null    $fieldResolverCallback
      */
     public function __construct(
         ExecutionContext $context,
         FieldCollector $fieldCollector,
-        ValuesResolver $valueResolver,
         ?callable $typeResolverCallback = null,
         ?callable $fieldResolverCallback = null
     ) {
         $this->context               = $context;
         $this->fieldCollector        = $fieldCollector;
-        $this->valuesResolver        = $valueResolver;
         $this->typeResolverCallback  = $typeResolverCallback ?? [$this, 'defaultTypeResolver'];
         $this->fieldResolverCallback = $fieldResolverCallback ?? [$this, 'defaultFieldResolver'];
     }
@@ -245,7 +237,7 @@ protected function resolveFieldValueOrError(
             // variables scope to fulfill any variable references.
             $result = $resolveCallback(
                 $rootValue,
-                $this->valuesResolver->coerceArgumentValues($field, $fieldNode, $context->getVariableValues()),
+                ValuesResolver::coerceArgumentValues($field, $fieldNode, $context->getVariableValues()),
                 $context->getContextValue(),
                 $info
             );

src/Execution/Strategy/FieldCollector.php

@@ -36,22 +36,15 @@ class FieldCollector
      */
     protected $includeDirective;
 
-    /**
-     * @var ValuesResolver
-     */
-    protected $valuesResolver;
-
     /**
      * FieldCollector constructor.
      * @param ExecutionContext $context
-     * @param ValuesResolver   $valuesResolver
      */
-    public function __construct(ExecutionContext $context, ValuesResolver $valuesResolver)
+    public function __construct(ExecutionContext $context)
     {
         $this->context          = $context;
         $this->skipDirective    = SkipDirective();
         $this->includeDirective = IncludeDirective();
-        $this->valuesResolver   = $valuesResolver;
     }
 
     /**
@@ -131,13 +124,13 @@ protected function shouldIncludeNode(NodeInterface $node): bool
     {
         $contextVariables = $this->context->getVariableValues();
 
-        $skip = $this->valuesResolver->coerceDirectiveValues($this->skipDirective, $node, $contextVariables);
+        $skip = ValuesResolver::coerceDirectiveValues($this->skipDirective, $node, $contextVariables);
 
         if ($skip && $skip['if'] === true) {
             return false;
         }
 
-        $include = $this->valuesResolver->coerceDirectiveValues($this->includeDirective, $node, $contextVariables);
+        $include = ValuesResolver::coerceDirectiveValues($this->includeDirective, $node, $contextVariables);
 
         if ($include && $include['if'] === false) {
             return false;