Returned reference executor implementation back, updated tests, so both executors pass

Author: jakubkulhan

.gitignore

@@ -1,4 +1,5 @@
-composer.phar
+.phpcs-cache
 composer.lock
+composer.phar
 phpcs.xml
 vendor/

src/Executor/ExecutionContext.php

@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GraphQL\Executor;
+
+use GraphQL\Error\Error;
+use GraphQL\Executor\Promise\PromiseAdapter;
+use GraphQL\Language\AST\FragmentDefinitionNode;
+use GraphQL\Language\AST\OperationDefinitionNode;
+use GraphQL\Type\Schema;
+
+/**
+ * Data that must be available at all points during query execution.
+ *
+ * Namely, schema of the type system that is currently executing,
+ * and the fragments defined in the query document
+ *
+ * @internal
+ */
+class ExecutionContext
+{
+    /** @var Schema */
+    public $schema;
+
+    /** @var FragmentDefinitionNode[] */
+    public $fragments;
+
+    /** @var mixed */
+    public $rootValue;
+
+    /** @var mixed */
+    public $contextValue;
+
+    /** @var OperationDefinitionNode */
+    public $operation;
+
+    /** @var mixed[] */
+    public $variableValues;
+
+    /** @var callable */
+    public $fieldResolver;
+
+    /** @var Error[] */
+    public $errors;
+
+    /** @var PromiseAdapter */
+    public $promises;
+
+    public function __construct(
+        $schema,
+        $fragments,
+        $root,
+        $contextValue,
+        $operation,
+        $variables,
+        $errors,
+        $fieldResolver,
+        $promiseAdapter
+    ) {
+        $this->schema         = $schema;
+        $this->fragments      = $fragments;
+        $this->rootValue      = $root;
+        $this->contextValue   = $contextValue;
+        $this->operation      = $operation;
+        $this->variableValues = $variables;
+        $this->errors         = $errors ?: [];
+        $this->fieldResolver  = $fieldResolver;
+        $this->promises       = $promiseAdapter;
+    }
+
+    public function addError(Error $error)
+    {
+        $this->errors[] = $error;
+
+        return $this;
+    }
+}

src/Executor/Executor.php

@@ -28,17 +28,9 @@ class Executor
     /** @var callable */
     private static $implementationFactory = [CoroutineExecutor::class, 'create'];
 
-    /**
-     * @return PromiseAdapter
-     */
-    public static function getPromiseAdapter()
-    {
-        return self::$defaultPromiseAdapter ?: (self::$defaultPromiseAdapter = new SyncPromiseAdapter());
-    }
-
-    public static function setPromiseAdapter(?PromiseAdapter $defaultPromiseAdapter = null)
+    public static function getDefaultFieldResolver() : callable
     {
-        self::$defaultPromiseAdapter = $defaultPromiseAdapter;
+        return self::$defaultFieldResolver;
     }
 
     /**
@@ -50,15 +42,27 @@ public static function setDefaultFieldResolver(callable $fieldResolver)
     }
 
     /**
-     * @return callable
+     * @return PromiseAdapter
      */
-    public static function getImplementationFactory()
+    public static function getPromiseAdapter() : PromiseAdapter
+    {
+        return self::$defaultPromiseAdapter ?: (self::$defaultPromiseAdapter = new SyncPromiseAdapter());
+    }
+
+    public static function setPromiseAdapter(?PromiseAdapter $defaultPromiseAdapter = null)
+    {
+        self::$defaultPromiseAdapter = $defaultPromiseAdapter;
+    }
+
+    public static function getImplementationFactory() : callable
     {
         return self::$implementationFactory;
     }
 
     /**
-     * Custom executor implementation.
+     * Custom executor implementation factory.
+     *
+     * Will be called with as
      */
     public static function setImplementationFactory(callable $implementationFactory)
     {
@@ -134,7 +138,7 @@ public static function promiseToExecute(
     ) {
         $factory = self::$implementationFactory;
 
-        /** @var Implementation $executor */
+        /** @var ExecutorImplementation $executor */
         $executor = $factory(
             $promiseAdapter,
             $schema,

src/Executor/Implementation.php renamed to src/Executor/ExecutorImplementation.php

@@ -9,11 +9,10 @@
 /**
  * Executor implementation.
  */
-interface Implementation
+interface ExecutorImplementation
 {
     /**
      * Returns promise of {@link ExecutionResult}. Promise should always resolve, never reject.
-     *
      */
     public function doExecute() : Promise;
 }