Merge pull request #165 from clue-labs/php8.2

Make tests compatible with PHP 8.2 by avoiding dynamic properties
reactphp · Jun 24, 2022 · 68c2121 · 68c2121
2 parents c7af3d8 + f96bfb2
commit 68c2121
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/tests/EnforceBlockingWrapper.php b/tests/EnforceBlockingWrapper.php
@@ -5,10 +5,12 @@
 /**
  * Used to test dummy stream resources that do not support setting non-blocking mode
  *
- * @link http://php.net/manual/de/class.streamwrapper.php
+ * @link https://www.php.net/manual/en/class.streamwrapper.php
  */
 class EnforceBlockingWrapper
 {
+    public $context;
+
     public function stream_open($path, $mode, $options, &$opened_path)
     {
         return true;

diff --git a/tests/WritableResourceStreamTest.php b/tests/WritableResourceStreamTest.php
@@ -157,14 +157,23 @@ public function testEmptyWriteDoesNotAddToLoop()
     public function testWriteReturnsFalseWhenWritableResourceStreamIsFull()
     {
         $stream = fopen('php://temp', 'r+');
-        $loop = $this->createWriteableLoopMock();
-        $loop->preventWrites = true;
+
+        $preventWrites = true;
+        $loop = $this->createLoopMock();
+        $loop
+            ->expects($this->any())
+            ->method('addWriteStream')
+            ->will($this->returnCallback(function ($stream, $listener) use (&$preventWrites) {
+                if (!$preventWrites) {
+                    call_user_func($listener, $stream);
+                }
+            }));
 
         $buffer = new WritableResourceStream($stream, $loop, 4);
         $buffer->on('error', $this->expectCallableNever());
 
         $this->assertTrue($buffer->write("foo"));
-        $loop->preventWrites = false;
+        $preventWrites = false;
         $this->assertFalse($buffer->write("bar\n"));
     }
 
@@ -504,14 +513,11 @@ public function testWritingToClosedStream()
     private function createWriteableLoopMock()
     {
         $loop = $this->createLoopMock();
-        $loop->preventWrites = false;
         $loop
             ->expects($this->any())
             ->method('addWriteStream')
-            ->will($this->returnCallback(function ($stream, $listener) use ($loop) {
-                if (!$loop->preventWrites) {
-                    call_user_func($listener, $stream);
-                }
+            ->will($this->returnCallback(function ($stream, $listener) {
+                call_user_func($listener, $stream);
             }));
 
         return $loop;