Add PromiseAdapter to executor interface execute args

UPGRADE-0.12.md

@@ -115,18 +115,11 @@ Foo:
 This section is only for users using custom executor.
 
 The interface move to be look a little be more to `GraphQL\GraphQL`
-execute method.
+`promiseToExecute` method.
 
 In `Overblog\GraphQLBundle\Executor\ExecutorInterface`
 `setPromiseAdapter` and `setDefaultFieldResolver` has been removed.
-To use promise adapter should now inject it using DI like this:
 
-```yaml
-services:
-    App\CustomExecutor:
-        calls:
-            - ["setPromiseAdapter", ['@overblog_graphql.promise_adapter']]
-```
-
-Default field resolver is now the 7th argument (`$fieldResolver`) of
+Promise adapter is now the first argument (`$promiseAdapter`)
+and default field resolver the 7th argument (`$fieldResolver`) of
 `Overblog\GraphQLBundle\Executor\ExecutorInterface::execute` method.

src/Executor/Executor.php

@@ -12,13 +12,11 @@
 
 class Executor implements ExecutorInterface
 {
-    /** @var PromiseAdapter */
-    private $promiseAdapter;
-
     /**
      * {@inheritdoc}
      */
     public function execute(
+        PromiseAdapter $promiseAdapter,
         Schema $schema,
         string $requestString,
         $rootValue = null,
@@ -28,7 +26,7 @@ public function execute(
         ?callable $fieldResolver = null,
         ?array $validationRules = null
     ): ExecutionResult {
-        if ($this->promiseAdapter && !$this->promiseAdapter instanceof PromiseAdapterInterface && !\is_callable([$this->promiseAdapter, 'wait'])) {
+        if (!\method_exists($promiseAdapter, 'wait')) {
             throw new \RuntimeException(
                 \sprintf(
                     'PromiseAdapter should be an object instantiating "%s" or "%s" with a "wait" method.',
@@ -38,11 +36,6 @@ public function execute(
             );
         }
 
-        return $this->promiseAdapter->wait(GraphQL::promiseToExecute($this->promiseAdapter, ...\func_get_args()));
-    }
-
-    public function setPromiseAdapter(PromiseAdapter $promiseAdapter): void
-    {
-        $this->promiseAdapter = $promiseAdapter;
+        return $promiseAdapter->wait(GraphQL::promiseToExecute(...\func_get_args()));
     }
 }

src/Executor/ExecutorInterface.php

@@ -5,23 +5,26 @@
 namespace Overblog\GraphQLBundle\Executor;
 
 use GraphQL\Executor\ExecutionResult;
+use GraphQL\Executor\Promise\PromiseAdapter;
 use GraphQL\Type\Schema;
 
 interface ExecutorInterface
 {
     /**
-     * @param Schema        $schema
-     * @param string        $requestString
-     * @param mixed         $rootValue
-     * @param array|null    $contextValue
-     * @param array|null    $variableValues
-     * @param string|null   $operationName
-     * @param callable|null $fieldResolver
-     * @param array|null    $validationRules
+     * @param PromiseAdapter $promiseAdapter
+     * @param Schema         $schema
+     * @param string         $requestString
+     * @param mixed          $rootValue
+     * @param array|null     $contextValue
+     * @param array|null     $variableValues
+     * @param string|null    $operationName
+     * @param callable|null  $fieldResolver
+     * @param array|null     $validationRules
      *
      * @return ExecutionResult
      */
     public function execute(
+        PromiseAdapter $promiseAdapter,
         Schema $schema,
         string $requestString,
         $rootValue = null,

src/Request/Executor.php

@@ -5,6 +5,8 @@
 namespace Overblog\GraphQLBundle\Request;
 
 use GraphQL\Executor\ExecutionResult;
+use GraphQL\Executor\Promise\PromiseAdapter;
+use GraphQL\Experimental\Executor\CoroutineExecutor;
 use GraphQL\Type\Schema;
 use GraphQL\Validator\DocumentValidator;
 use GraphQL\Validator\Rules\DisableIntrospection;
@@ -23,24 +25,24 @@ class Executor
 {
     public const PROMISE_ADAPTER_SERVICE_ID = 'overblog_graphql.promise_adapter';
 
-    /** @var Schema[] */
     private $schemas = [];
 
-    /** @var EventDispatcherInterface|null */
     private $dispatcher;
 
-    /** @var ExecutorInterface */
+    private $promiseAdapter;
+
     private $executor;
 
-    /** @var callable|null */
     private $defaultFieldResolver;
 
     public function __construct(
         ExecutorInterface $executor,
+        PromiseAdapter $promiseAdapter,
         EventDispatcherInterface $dispatcher,
         ?callable $defaultFieldResolver = null
     ) {
         $this->executor = $executor;
+        $this->promiseAdapter = $promiseAdapter;
         $this->dispatcher = $dispatcher;
         $this->defaultFieldResolver = $defaultFieldResolver;
     }
@@ -119,7 +121,7 @@ public function disableIntrospectionQuery(): void
      *
      * @return ExecutionResult
      */
-    public function execute(?string $schemaName = null, array $request, $rootValue = null): ExecutionResult
+    public function execute(?string $schemaName, array $request, $rootValue = null): ExecutionResult
     {
         $executorArgumentsEvent = $this->preExecute(
             $this->getSchema($schemaName),
@@ -133,6 +135,7 @@ public function execute(?string $schemaName = null, array $request, $rootValue =
         $executorArgumentsEvent->getSchema()->processExtensions();
 
         $result = $this->executor->execute(
+            $this->promiseAdapter,
             $executorArgumentsEvent->getSchema(),
             $executorArgumentsEvent->getRequestString(),
             $executorArgumentsEvent->getRootValue(),

src/Resolver/AccessResolver.php

@@ -64,6 +64,11 @@ private function checkAccessForStrictMode(callable $accessChecker, callable $res
         if ($this->isThenable($promiseOrHasAccess)) {
             return $this->createPromise($promiseOrHasAccess, $callback);
         } else {
+            $promiseOrHasAccess = $this->extractAdoptedPromise($promiseOrHasAccess);
+            if ($promiseOrHasAccess instanceof SyncPromise) {
+                $promiseOrHasAccess = $promiseOrHasAccess->result;
+            }
+
             return $callback($promiseOrHasAccess);
         }
     }

src/Resources/config/services.yml

@@ -5,14 +5,13 @@ services:
     overblog_graphql.executor.default:
         class: Overblog\GraphQLBundle\Executor\Executor
         public: false
-        calls:
-            - ["setPromiseAdapter", ['@overblog_graphql.promise_adapter']]
 
     overblog_graphql.request_executor:
         class: Overblog\GraphQLBundle\Request\Executor
         public: true
         arguments:
             - "@overblog_graphql.executor"
+            - "@overblog_graphql.promise_adapter"
             - "@event_dispatcher"
             - '%overblog_graphql.default_resolver%'
         calls:

tests/Executor/ExecutorTest.php

@@ -19,7 +19,6 @@ public function testInvalidExecutorAdapterPromise(): void
     {
         $schema = $this->getMockBuilder(Schema::class)->disableOriginalConstructor()->getMock();
         $executor = new Executor();
-        $executor->setPromiseAdapter(new ReactPromiseAdapter());
-        $executor->execute($schema, '');
+        $executor->execute(new ReactPromiseAdapter(), $schema, '');
     }
 }

tests/Request/ExecutorTest.php

@@ -4,6 +4,7 @@
 
 namespace Overblog\GraphQLBundle\Tests\Request;
 
+use GraphQL\Executor\Promise\Adapter\ReactPromiseAdapter;
 use Overblog\GraphQLBundle\Executor\Executor;
 use Overblog\GraphQLBundle\Request\Executor as RequestExecutor;
 use PHPUnit\Framework\TestCase;
@@ -19,6 +20,6 @@ public function testGetSchemaNoSchemaFound(): void
     {
         $dispatcher = $this->getMockBuilder(EventDispatcher::class)->setMethods(['dispatch'])->getMock();
 
-        (new RequestExecutor(new Executor(), $dispatcher))->getSchema('fake');
+        (new RequestExecutor(new Executor(), new ReactPromiseAdapter(), $dispatcher))->getSchema('fake');
     }
 }