Merge pull request #13 from dmnlk/feature/php84-compatible

Feature/php84 compatible
ezimuel · Jan 14, 2025 · 648a9c3 · 648a9c3
2 parents 7887fc8 + b1a16f1
commit 648a9c3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,11 +9,11 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [7.4, 8.0, 8.1]
+        php-version: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Use PHP ${{ matrix.php-version }}
       uses: shivammathur/setup-php@v2
@@ -25,10 +25,10 @@ jobs:
 
     - name: Get composer cache directory
       id: composercache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composercache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -41,4 +41,4 @@ jobs:
     - name: Unit tests
       run: |
         composer run-script test
-        
+        
diff --git a/src/Core.php b/src/Core.php
@@ -333,9 +333,9 @@ public static function doSleep(array $request)
      */
     public static function proxy(
         FutureArrayInterface $future,
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null,
+        ?callable $onProgress = null
     ) {
         return new FutureArray(
             $future->then($onFulfilled, $onRejected, $onProgress),

diff --git a/src/Future/BaseFutureTrait.php b/src/Future/BaseFutureTrait.php
@@ -39,8 +39,8 @@ trait BaseFutureTrait
      */
     public function __construct(
         PromiseInterface $promise,
-        callable $wait = null,
-        callable $cancel = null
+        ?callable $wait = null,
+        ?callable $cancel = null
     ) {
         $this->wrappedPromise = $promise;
         $this->waitfn = $wait;
@@ -81,9 +81,9 @@ public function promise()
      * @return PromiseInterface
      */
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null,
+        ?callable $onProgress = null
     ) {
         return $this->wrappedPromise->then($onFulfilled, $onRejected, $onProgress);
     }

diff --git a/src/Future/CompletedFutureValue.php b/src/Future/CompletedFutureValue.php
@@ -20,7 +20,7 @@ class CompletedFutureValue implements FutureInterface
      * @param \Exception $e      Error. Pass a GuzzleHttp\Ring\Exception\CancelledFutureAccessException
      *                           to mark the future as cancelled.
      */
-    public function __construct($result, \Exception $e = null)
+    public function __construct($result, ?\Exception $e = null)
     {
         $this->result = $result;
         $this->error = $e;
@@ -58,9 +58,9 @@ public function promise()
      * @return PromiseInterface
      */
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null,
+        ?callable $onProgress = null
     ) {
         return $this->promise()->then($onFulfilled, $onRejected, $onProgress);
     }