[2.3] PHP 8.5 support (#183)

* PHP 8.5 support

* Update CoroutineTest.php

* Fix deprecations

Author: GrahamCampbell

.github/workflows/checks.yml

@@ -11,11 +11,11 @@ permissions:
 jobs:
   composer-normalize:
     name: Composer Normalize
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Composer normalize
         uses: docker://ergebnis/composer-normalize-action

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ permissions:
 jobs:
   build-lowest-version:
     name: Build lowest version
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Set up PHP
@@ -23,7 +23,7 @@ jobs:
           extensions: mbstring
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install dependencies
         run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress
@@ -33,11 +33,11 @@ jobs:
 
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       max-parallel: 10
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Set up PHP
@@ -49,7 +49,7 @@ jobs:
           extensions: mbstring
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install dependencies
         run: composer update --no-interaction --no-progress

.github/workflows/static.yml

@@ -11,16 +11,16 @@ permissions:
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.2'
           coverage: none
           extensions: mbstring
 
@@ -35,11 +35,11 @@ jobs:
 
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -59,16 +59,16 @@ jobs:
 
   psalm:
     name: Psalm
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.2'
           coverage: none
           extensions: mbstring
 

README.md

@@ -41,7 +41,7 @@ composer require guzzlehttp/promises
 | Version | Status              | PHP Version  |
 |---------|---------------------|--------------|
 | 1.x     | Security fixes only | >=5.5,<8.3   |
-| 2.x     | Latest              | >=7.2.5,<8.5 |
+| 2.x     | Latest              | >=7.2.5,<8.6 |
 
 
 ## Quick Start

composer.json

@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+        "phpunit/phpunit": "^8.5.44 || ^9.6.25"
     },
     "autoload": {
         "psr-4": {

psalm-baseline.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0"/>
+<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51"/>

psalm.xml

@@ -15,4 +15,8 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <MissingOverrideAttribute errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

tests/CoroutineTest.php

@@ -31,13 +31,17 @@ public function testShouldProxyPromiseMethodsToResultPromise($method, $args = []
         $mockPromise->expects($this->once())->method($method)->with(...$args);
 
         $resultPromiseProp = (new ReflectionClass(Coroutine::class))->getProperty('result');
-        $resultPromiseProp->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $resultPromiseProp->setAccessible(true);
+        }
+
         $resultPromiseProp->setValue($coroutine, $mockPromise);
 
         $coroutine->{$method}(...$args);
     }
 
-    public function promiseInterfaceMethodProvider()
+    public static function promiseInterfaceMethodProvider()
     {
         return [
             ['then', [null, null]],
@@ -59,14 +63,18 @@ public function testShouldCancelResultPromiseAndOutsideCurrentPromise(): void
         ];
         foreach ($mockPromises as $propName => $mockPromise) {
             /**
-             * @var $mockPromise \PHPUnit_Framework_MockObject_MockObject
+             * @var \PHPUnit_Framework_MockObject_MockObject $mockPromise
              */
             $mockPromise->expects($this->once())
                 ->method('cancel')
                 ->with();
 
             $promiseProp = (new ReflectionClass(Coroutine::class))->getProperty($propName);
-            $promiseProp->setAccessible(true);
+
+            if (PHP_VERSION_ID < 80100) {
+                $promiseProp->setAccessible(true);
+            }
+
             $promiseProp->setValue($coroutine, $mockPromise);
         }
 

tests/PropertyHelper.php

@@ -22,7 +22,10 @@ class PropertyHelper
     public static function get($object, $property)
     {
         $property = (new \ReflectionObject($object))->getProperty($property);
-        $property->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         return $property->getValue($object);
     }

tests/UtilsTest.php

@@ -318,7 +318,7 @@ function ($reason) use (&$result): void { $result = $reason; }
         $this->assertSame('a', $result->getMessage());
     }
 
-    public function rejectsParentExceptionProvider()
+    public static function rejectsParentExceptionProvider()
     {
         return [
             [P\Coroutine::of(function () {