Revert "Optimize Deferred execution (#1805)"

CHANGELOG.md

@@ -9,16 +9,6 @@ You can find and compare releases at the [GitHub release page](https://github.co
 
 ## Unreleased
 
-## v15.29.0
-
-### Changed
-
-- Optimize `Deferred` execution https://github.com/webonyx/graphql-php/pull/1805
-
-### Deprecated
-
-- Deprecate `GraphQL\Deferred::create()` in favor of constructor https://github.com/webonyx/graphql-php/pull/1805
-
 ## v15.28.0
 
 ### Changed

benchmarks/HugeSchemaBench.php

@@ -14,11 +14,11 @@
  *
  * @OutputTimeUnit("milliseconds", precision=3)
  *
- * @Warmup(2)
+ * @Warmup(1)
  *
- * @Revs(10)
+ * @Revs(5)
  *
- * @Iterations(3)
+ * @Iterations(1)
  */
 class HugeSchemaBench
 {
@@ -50,7 +50,6 @@ public function benchSchema(): void
             ->getTypeMap();
     }
 
-    /** @Revs(1000) */
     public function benchSchemaLazy(): void
     {
         $this->createLazySchema();

benchmarks/StarWarsBench.php

@@ -11,11 +11,11 @@
  *
  * @OutputTimeUnit("milliseconds", precision=3)
  *
- * @Warmup(5)
+ * @Warmup(2)
  *
- * @Revs(100)
+ * @Revs(10)
  *
- * @Iterations(10)
+ * @Iterations(2)
  */
 class StarWarsBench
 {

composer.json

@@ -64,7 +64,7 @@
   },
   "scripts": {
     "baseline": "phpstan --generate-baseline",
-    "bench": "php -d zend.assertions=-1 vendor/bin/phpbench run --report=default",
+    "bench": "phpbench run",
     "check": [
       "@fix",
       "@stan",
@@ -78,6 +78,6 @@
     "php-cs-fixer": "make php-cs-fixer",
     "rector": "rector process",
     "stan": "phpstan --verbose",
-    "test": "php -d zend.exception_ignore_args=0 -d zend.assertions=1 -d assert.active=1 -d assert.exception=1 vendor/bin/phpunit"
+    "test": "php -d zend.exception_ignore_args=Off -d zend.assertions=On -d assert.active=On -d assert.exception=On vendor/bin/phpunit"
   }
 }

docs/class-reference.md

@@ -1778,25 +1778,6 @@ function createRejected(Throwable $reason): GraphQL\Executor\Promise\Promise
 function all(iterable $promisesOrValues): GraphQL\Executor\Promise\Promise
 ```
 
-## GraphQL\Deferred
-
-User-facing promise class for deferred field resolution.
-
-@phpstan-type Executor callable(): mixed
-
-### GraphQL\Deferred Methods
-
-```php
-/**
- * Create a new Deferred promise and enqueue its execution.
- *
- * @api
- *
- * @param Executor $executor
- */
-function __construct(callable $executor)
-```
-
 ## GraphQL\Validator\DocumentValidator
 
 Implements the "Validation" section of the spec.

generate-class-reference.php

@@ -23,7 +23,6 @@
     GraphQL\Executor\ScopedContext::class => [],
     GraphQL\Executor\ExecutionResult::class => [],
     GraphQL\Executor\Promise\PromiseAdapter::class => [],
-    GraphQL\Deferred::class => [],
     GraphQL\Validator\DocumentValidator::class => [],
     GraphQL\Error\Error::class => ['constants' => true],
     GraphQL\Error\Warning::class => ['constants' => true],

phpbench.json

@@ -3,11 +3,5 @@
   "runner.path": "benchmarks",
   "runner.file_pattern": "*Bench.php",
   "runner.retry_threshold": 5,
-  "runner.time_unit": "milliseconds",
-  "runner.progress": "plain",
-  "report.generators": {
-    "default": {
-      "extends": "aggregate"
-    }
-  }
+  "runner.time_unit": "milliseconds"
 }

src/Deferred.php

@@ -3,55 +3,21 @@
 namespace GraphQL;
 
 use GraphQL\Executor\Promise\Adapter\SyncPromise;
-use GraphQL\Executor\Promise\Adapter\SyncPromiseQueue;
 
 /**
- * User-facing promise class for deferred field resolution.
- *
- * @phpstan-type Executor callable(): mixed
+ * @phpstan-import-type Executor from SyncPromise
  */
 class Deferred extends SyncPromise
 {
-    /**
-     * Executor for deferred promises.
-     *
-     * @var (callable(): mixed)|null
-     */
-    protected $executor;
-
-    /**
-     * Create a new Deferred promise and enqueue its execution.
-     *
-     * @api
-     *
-     * @param Executor $executor
-     */
-    public function __construct(callable $executor)
+    /** @param Executor $executor */
+    public static function create(callable $executor): self
     {
-        $this->executor = $executor;
-
-        SyncPromiseQueue::enqueue(function (): void {
-            $executor = $this->executor;
-            assert($executor !== null, 'Always set in constructor, this callback runs only once.');
-            $this->executor = null;
-
-            try {
-                $this->resolve($executor());
-            } catch (\Throwable $e) {
-                $this->reject($e);
-            }
-        });
+        return new self($executor);
     }
 
-    /**
-     * Alias for __construct.
-     *
-     * @param Executor $executor
-     *
-     * @deprecated TODO remove in next major version, use new Deferred() instead
-     */
-    public static function create(callable $executor): self
+    /** @param Executor $executor */
+    public function __construct(callable $executor)
     {
-        return new self($executor);
+        parent::__construct($executor);
     }
 }

src/Executor/Promise/Adapter/AmpPromiseAdapter.php

@@ -41,9 +41,10 @@ public function then(Promise $promise, ?callable $onFulfilled = null, ?callable
             }
         };
 
-        $ampPromise = $promise->adoptedPromise;
-        assert($ampPromise instanceof AmpPromise);
-        $ampPromise->onResolve($onResolve);
+        $adoptedPromise = $promise->adoptedPromise;
+        assert($adoptedPromise instanceof AmpPromise);
+
+        $adoptedPromise->onResolve($onResolve);
 
         return new Promise($deferred->promise(), $this);
     }

src/Executor/Promise/Adapter/ReactPromiseAdapter.php

@@ -28,34 +28,34 @@ public function convertThenable($thenable): Promise
     /** @throws InvariantViolation */
     public function then(Promise $promise, ?callable $onFulfilled = null, ?callable $onRejected = null): Promise
     {
-        $reactPromise = $promise->adoptedPromise;
-        assert($reactPromise instanceof ReactPromiseInterface);
+        $adoptedPromise = $promise->adoptedPromise;
+        assert($adoptedPromise instanceof ReactPromiseInterface);
 
-        return new Promise($reactPromise->then($onFulfilled, $onRejected), $this);
+        return new Promise($adoptedPromise->then($onFulfilled, $onRejected), $this);
     }
 
     /** @throws InvariantViolation */
     public function create(callable $resolver): Promise
     {
-        $reactPromise = new ReactPromise($resolver);
+        $promise = new ReactPromise($resolver);
 
-        return new Promise($reactPromise, $this);
+        return new Promise($promise, $this);
     }
 
     /** @throws InvariantViolation */
     public function createFulfilled($value = null): Promise
     {
-        $reactPromise = resolve($value);
+        $promise = resolve($value);
 
-        return new Promise($reactPromise, $this);
+        return new Promise($promise, $this);
     }
 
     /** @throws InvariantViolation */
     public function createRejected(\Throwable $reason): Promise
     {
-        $reactPromise = reject($reason);
+        $promise = reject($reason);
 
-        return new Promise($reactPromise, $this);
+        return new Promise($promise, $this);
     }
 
     /** @throws InvariantViolation */
@@ -70,11 +70,11 @@ public function all(iterable $promisesOrValues): Promise
         $promisesOrValuesArray = is_array($promisesOrValues)
             ? $promisesOrValues
             : iterator_to_array($promisesOrValues);
-        $reactPromise = all($promisesOrValuesArray)->then(static fn (array $values): array => array_map(
+        $promise = all($promisesOrValuesArray)->then(static fn ($values): array => array_map(
             static fn ($key) => $values[$key],
             array_keys($promisesOrValuesArray),
         ));
 
-        return new Promise($reactPromise, $this);
+        return new Promise($promise, $this);
     }
 }