diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b38e843..83a85d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] + php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -25,10 +25,6 @@ jobs: tools: composer:v2 coverage: none - - name: Emulate PHP 8.3 - run: composer config platform.php 8.3.999 - if: matrix.php == '8.4' - - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress @@ -40,11 +36,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] + php: ['7.1', '7.4', '8.0', '8.5'] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -53,10 +49,6 @@ jobs: tools: composer:v2 coverage: none - - name: Emulate PHP 8.3 - run: composer config platform.php 8.3.999 - if: matrix.php == '8.4' - - name: Install dependencies run: | composer require "sebastian/comparator:^3.0.2" --no-interaction --no-update @@ -71,7 +63,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 143e55e..bbf2666 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v7 - name: Remove phpspec run: composer remove --dev friends-of-phpspec/phpspec-code-coverage phpspec/phpspec @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v7 - name: PHP-CS-Fixer uses: docker://oskarstark/php-cs-fixer-ga diff --git a/composer.json b/composer.json index 7391770..c5e5e93 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,8 @@ "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", - "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0 || ^7.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0 || ^8.3" }, "autoload": { "psr-4": { diff --git a/src/Promise/HttpFulfilledPromise.php b/src/Promise/HttpFulfilledPromise.php index ccdf48e..09c7e75 100644 --- a/src/Promise/HttpFulfilledPromise.php +++ b/src/Promise/HttpFulfilledPromise.php @@ -18,6 +18,9 @@ public function __construct(ResponseInterface $response) $this->response = $response; } + /** + * @param (callable(ResponseInterface): ResponseInterface)|null $onFulfilled + */ public function then(?callable $onFulfilled = null, ?callable $onRejected = null) { if (null === $onFulfilled) { diff --git a/src/Promise/HttpRejectedPromise.php b/src/Promise/HttpRejectedPromise.php index a489ad4..0bd878e 100644 --- a/src/Promise/HttpRejectedPromise.php +++ b/src/Promise/HttpRejectedPromise.php @@ -4,6 +4,7 @@ use Http\Client\Exception; use Http\Promise\Promise; +use Psr\Http\Message\ResponseInterface; final class HttpRejectedPromise implements Promise { @@ -17,6 +18,9 @@ public function __construct(Exception $exception) $this->exception = $exception; } + /** + * @param (callable(Exception): (ResponseInterface|Promise))|null $onRejected + */ public function then(?callable $onFulfilled = null, ?callable $onRejected = null) { if (null === $onRejected) {