Add PHP 8.4 to the CI and fix implicit nullable types

.github/workflows/ci.yml

@@ -11,6 +11,7 @@ jobs:
  strategy:
  matrix:
  php:
+ - 8.4
  - 8.3
  - 8.2
  - 8.1
@@ -26,6 +27,8 @@ jobs:
  php-version: ${{ matrix.php }}
  coverage: xdebug
  ini-file: development
+ - run: composer config minimum-stability dev
+ if: ${{ matrix.php >= 8.4 }}
  - run: composer install
  - run: vendor/bin/phpunit --coverage-text
  if: ${{ matrix.php >= 7.3 }}

src/Deferred.php

@@ -21,7 +21,7 @@ final class Deferred
  /**
  * @param (callable(callable(T):void,callable(\Throwable):void):void)|null $canceller
  */
- public function __construct(callable $canceller = null)
+ public function __construct(?callable $canceller = null)
  {
  $this->promise = new Promise(function ($resolve, $reject): void {
  $this->resolveCallback = $resolve;

src/Internal/FulfilledPromise.php

@@ -34,7 +34,7 @@ public function __construct($value = null)
  * @param ?(callable((T is void ? null : T)): (PromiseInterface<TFulfilled>|TFulfilled)) $onFulfilled
  * @return PromiseInterface<($onFulfilled is null ? T : TFulfilled)>
  */
- public function then(callable $onFulfilled = null, callable $onRejected = null): PromiseInterface
+ public function then(?callable $onFulfilled = null, ?callable $onRejected = null): PromiseInterface
  {
  if (null === $onFulfilled) {
  return $this;

src/Internal/RejectedPromise.php

@@ -61,7 +61,7 @@ public function __destruct()
  * @param ?(callable(\Throwable): (PromiseInterface<TRejected>|TRejected)) $onRejected
  * @return PromiseInterface<($onRejected is null ? never : TRejected)>
  */
- public function then(callable $onFulfilled = null, callable $onRejected = null): PromiseInterface
+ public function then(?callable $onFulfilled = null, ?callable $onRejected = null): PromiseInterface
  {
  if (null === $onRejected) {
  return $this;

src/Promise.php

@@ -29,7 +29,7 @@ final class Promise implements PromiseInterface
  * @param callable(callable(T):void,callable(\Throwable):void):void $resolver
  * @param (callable(callable(T):void,callable(\Throwable):void):void)|null $canceller
  */
- public function __construct(callable $resolver, callable $canceller = null)
+ public function __construct(callable $resolver, ?callable $canceller = null)
  {
  $this->canceller = $canceller;
 
@@ -41,7 +41,7 @@ public function __construct(callable $resolver, callable $canceller = null)
  $this->call($cb);
  }
 
- public function then(callable $onFulfilled = null, callable $onRejected = null): PromiseInterface
+ public function then(?callable $onFulfilled = null, ?callable $onRejected = null): PromiseInterface
  {
  if (null !== $this->result) {
  return $this->result->then($onFulfilled, $onRejected);
@@ -166,7 +166,7 @@ public function always(callable $onFulfilledOrRejected): PromiseInterface
  return $this->finally($onFulfilledOrRejected);
  }
 
- private function resolver(callable $onFulfilled = null, callable $onRejected = null): callable
+ private function resolver(?callable $onFulfilled = null, ?callable $onRejected = null): callable
  {
  return function (callable $resolve, callable $reject) use ($onFulfilled, $onRejected): void {
  $this->handlers[] = static function (PromiseInterface $promise) use ($onFulfilled, $onRejected, $resolve, $reject): void {

tests/DeferredTest.php

@@ -14,7 +14,7 @@ class DeferredTest extends TestCase
  /**
  * @return CallbackPromiseAdapter<T>
  */
- public function getPromiseTestAdapter(callable $canceller = null): CallbackPromiseAdapter
+ public function getPromiseTestAdapter(?callable $canceller = null): CallbackPromiseAdapter
  {
  $d = new Deferred($canceller);
 

tests/Internal/FulfilledPromiseTest.php

@@ -20,7 +20,7 @@ class FulfilledPromiseTest extends TestCase
  /**
  * @return CallbackPromiseAdapter<T>
  */
- public function getPromiseTestAdapter(callable $canceller = null): CallbackPromiseAdapter
+ public function getPromiseTestAdapter(?callable $canceller = null): CallbackPromiseAdapter
  {
  /** @var ?FulfilledPromise<T> */
  $promise = null;

tests/Internal/RejectedPromiseTest.php

@@ -17,7 +17,7 @@ class RejectedPromiseTest extends TestCase
  /**
  * @return CallbackPromiseAdapter<never>
  */
- public function getPromiseTestAdapter(callable $canceller = null): CallbackPromiseAdapter
+ public function getPromiseTestAdapter(?callable $canceller = null): CallbackPromiseAdapter
  {
  /** @var ?RejectedPromise */
  $promise = null;

tests/PromiseTest.php

@@ -15,7 +15,7 @@ class PromiseTest extends TestCase
  /**
  * @return CallbackPromiseAdapter<T>
  */
- public function getPromiseTestAdapter(callable $canceller = null): CallbackPromiseAdapter
+ public function getPromiseTestAdapter(?callable $canceller = null): CallbackPromiseAdapter
  {
  $resolveCallback = $rejectCallback = null;
 

tests/PromiseTest/CancelTestTrait.php

@@ -8,7 +8,7 @@
 
 trait CancelTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function cancelShouldCallCancellerWithResolverArguments(): void

tests/PromiseTest/PromiseFulfilledTestTrait.php

@@ -11,7 +11,7 @@
 
 trait PromiseFulfilledTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function fulfilledPromiseShouldBeImmutable(): void

tests/PromiseTest/PromisePendingTestTrait.php

@@ -7,7 +7,7 @@
 
 trait PromisePendingTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function thenShouldReturnAPromiseForPendingPromise(): void

tests/PromiseTest/PromiseRejectedTestTrait.php

@@ -11,7 +11,7 @@
 
 trait PromiseRejectedTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function rejectedPromiseShouldBeImmutable(): void

tests/PromiseTest/PromiseSettledTestTrait.php

@@ -8,7 +8,7 @@
 
 trait PromiseSettledTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function thenShouldReturnAPromiseForSettledPromise(): void

tests/PromiseTest/RejectTestTrait.php

@@ -12,7 +12,7 @@
 
 trait RejectTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function rejectShouldRejectWithAnException(): void

tests/PromiseTest/ResolveTestTrait.php

@@ -13,7 +13,7 @@
 
 trait ResolveTestTrait
 {
- abstract public function getPromiseTestAdapter(callable $canceller = null): PromiseAdapterInterface;
+ abstract public function getPromiseTestAdapter(?callable $canceller = null): PromiseAdapterInterface;
 
  /** @test */
  public function resolveShouldResolve(): void

tests/fixtures/SimpleFulfilledTestThenable.php

@@ -4,7 +4,7 @@
 
 class SimpleFulfilledTestThenable
 {
- public function then(callable $onFulfilled = null, callable $onRejected = null): self
+ public function then(?callable $onFulfilled = null, ?callable $onRejected = null): self
  {
  if ($onFulfilled) {
  $onFulfilled('foo');

tests/fixtures/SimpleTestCancellableThenable.php

@@ -10,12 +10,12 @@ class SimpleTestCancellableThenable
  /** @var ?callable */
  public $onCancel;
 
- public function __construct(callable $onCancel = null)
+ public function __construct(?callable $onCancel = null)
  {
  $this->onCancel = $onCancel;
  }
 
- public function then(callable $onFulfilled = null, callable $onRejected = null): self
+ public function then(?callable $onFulfilled = null, ?callable $onRejected = null): self
  {
  return new self();
  }