Merge pull request #185 from WyriHaximus-secret-labs/1.x-PHP8.5

[1.x] Improve PHP 8.5+ support by avoiding deprecated method calls in tests

Author: clue

.github/workflows/ci.yml

@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         php:
+          - 8.5
           - 8.4
           - 8.3
           - 8.2
@@ -47,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           coverage: xdebug
           ini-file: development
       - run: composer install

tests/DuplexResourceStreamTest.php

@@ -27,7 +27,9 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
         $stream = new DuplexResourceStream($resource);
 
         $ref = new \ReflectionProperty($stream, 'loop');
-        $ref->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $ref->setAccessible(true);
+        }
         $loop = $ref->getValue($stream);
 
         $this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);

tests/ReadableResourceStreamTest.php

@@ -26,7 +26,9 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
         $stream = new ReadableResourceStream($resource);
 
         $ref = new \ReflectionProperty($stream, 'loop');
-        $ref->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $ref->setAccessible(true);
+        }
         $loop = $ref->getValue($stream);
 
         $this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);

tests/WritableResourceStreamTest.php

@@ -26,7 +26,9 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
         $stream = new WritableResourceStream($resource);
 
         $ref = new \ReflectionProperty($stream, 'loop');
-        $ref->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $ref->setAccessible(true);
+        }
         $loop = $ref->getValue($stream);
 
         $this->assertInstanceOf('React\EventLoop\LoopInterface', $loop);
@@ -472,6 +474,10 @@ public function testDoubleCloseWillEmitOnlyOnce()
      */
     public function testWritingToClosedWritableResourceStreamShouldNotWriteToStream()
     {
+        if (PHP_VERSION_ID >= 80500) {
+            $this->markTestSkipped('Since PHP 8.5 attempting to write to a closed stream will result in an error');
+        }
+
         $stream = fopen('php://temp', 'r+');
         $filterBuffer = '';
         $loop = $this->createLoopMock();