Update test suite and remove legacy PHPUnit workarounds

reactphp · May 15, 2024 · 1bb9595 · 1bb9595
1 parent a06b914
commit 1bb9595
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 138 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6 || ^5.7",
+        "phpunit/phpunit": "^9.6 || ^7.5",
         "clue/stream-filter": "~1.2"
     },
     "autoload": {

diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
@@ -2,7 +2,7 @@
 
 <!-- PHPUnit configuration file with old format for legacy PHPUnit -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>

diff --git a/tests/CompositeStreamTest.php b/tests/CompositeStreamTest.php
@@ -3,7 +3,9 @@
 namespace React\Tests\Stream;
 
 use React\Stream\CompositeStream;
+use React\Stream\ReadableStreamInterface;
 use React\Stream\ThroughStream;
+use React\Stream\WritableStreamInterface;
 
 /**
  * @covers React\Stream\CompositeStream
@@ -13,7 +15,7 @@ class CompositeStreamTest extends TestCase
     /** @test */
     public function itShouldCloseReadableIfNotWritable()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
@@ -22,7 +24,7 @@ public function itShouldCloseReadableIfNotWritable()
             ->expects($this->once())
             ->method('close');
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->once())
             ->method('isWritable')
@@ -37,13 +39,13 @@ public function itShouldCloseReadableIfNotWritable()
     /** @test */
     public function itShouldCloseWritableIfNotReadable()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
             ->willReturn(false);
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->once())
             ->method('close');
@@ -57,13 +59,13 @@ public function itShouldCloseWritableIfNotReadable()
     /** @test */
     public function itShouldForwardWritableCallsToWritableStream()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
             ->willReturn(true);
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->once())
             ->method('write')
@@ -81,7 +83,7 @@ public function itShouldForwardWritableCallsToWritableStream()
     /** @test */
     public function itShouldForwardReadableCallsToReadableStream()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->exactly(2))
             ->method('isReadable')
@@ -93,7 +95,7 @@ public function itShouldForwardReadableCallsToReadableStream()
             ->expects($this->once())
             ->method('resume');
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->any())
             ->method('isWritable')
@@ -108,7 +110,7 @@ public function itShouldForwardReadableCallsToReadableStream()
     /** @test */
     public function itShouldNotForwardResumeIfStreamIsNotWritable()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
@@ -117,7 +119,7 @@ public function itShouldNotForwardResumeIfStreamIsNotWritable()
             ->expects($this->never())
             ->method('resume');
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->exactly(2))
             ->method('isWritable')
@@ -130,13 +132,13 @@ public function itShouldNotForwardResumeIfStreamIsNotWritable()
     /** @test */
     public function endShouldDelegateToWritableWithData()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
             ->willReturn(true);
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->once())
             ->method('isWritable')
@@ -153,7 +155,7 @@ public function endShouldDelegateToWritableWithData()
     /** @test */
     public function closeShouldCloseBothStreams()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
@@ -162,7 +164,7 @@ public function closeShouldCloseBothStreams()
             ->expects($this->once())
             ->method('close');
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable
             ->expects($this->once())
             ->method('isWritable')
@@ -224,13 +226,13 @@ public function itShouldReceiveForwardedEvents()
     /** @test */
     public function itShouldHandlePipingCorrectly()
     {
-        $readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
+        $readable = $this->createMock(ReadableStreamInterface::class);
         $readable
             ->expects($this->once())
             ->method('isReadable')
             ->willReturn(true);
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable->expects($this->any())->method('isWritable')->willReturn(True);
         $writable
             ->expects($this->once())
@@ -249,12 +251,12 @@ public function itShouldForwardPipeCallsToReadableStream()
     {
         $readable = new ThroughStream();
 
-        $writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $writable = $this->createMock(WritableStreamInterface::class);
         $writable->expects($this->any())->method('isWritable')->willReturn(True);
 
         $composite = new CompositeStream($readable, $writable);
 
-        $output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $output = $this->createMock(WritableStreamInterface::class);
         $output->expects($this->any())->method('isWritable')->willReturn(True);
         $output
             ->expects($this->once())

diff --git a/tests/DuplexResourceStreamIntegrationTest.php b/tests/DuplexResourceStreamIntegrationTest.php
@@ -13,24 +13,22 @@ class DuplexResourceStreamIntegrationTest extends TestCase
 {
     public function loopProvider()
     {
-        return array(
-            array(
-                function() {
-                    return true;
-                },
-                function () {
-                    return new StreamSelectLoop();
-                }
-            ),
-            array(
-                function () {
-                    return class_exists('EventBase') && class_exists('React\EventLoop\ExtEventLoop');
-                },
-                function () {
-                    return new ExtEventLoop();
-                }
-            )
-        );
+        yield [
+            function() {
+                return true;
+            },
+            function () {
+                return new StreamSelectLoop();
+            }
+        ];
+        yield [
+            function () {
+                return class_exists('EventBase');
+            },
+            function () {
+                return new ExtEventLoop();
+            }
+        ];
     }
 
     /**

diff --git a/tests/DuplexResourceStreamTest.php b/tests/DuplexResourceStreamTest.php
@@ -2,8 +2,10 @@
 
 namespace React\Tests\Stream;
 
+use React\EventLoop\LoopInterface;
 use React\Stream\DuplexResourceStream;
 use React\Stream\WritableResourceStream;
+use React\Stream\WritableStreamInterface;
 use function Clue\StreamFilter\append as filter_append;
 
 class DuplexResourceStreamTest extends TestCase
@@ -56,7 +58,7 @@ public function testConstructorThrowsExceptionOnInvalidStream()
     {
         $loop = $this->createLoopMock();
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new DuplexResourceStream('breakme', $loop);
     }
 
@@ -67,7 +69,7 @@ public function testConstructorThrowsExceptionOnWriteOnlyStream()
     {
         $loop = $this->createLoopMock();
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new DuplexResourceStream(STDOUT, $loop);
     }
 
@@ -82,7 +84,7 @@ public function testConstructorThrowsExceptionOnWriteOnlyStreamWithExcessiveMode
         unlink($name);
 
         $loop = $this->createLoopMock();
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new DuplexResourceStream($stream, $loop);
     }
 
@@ -98,7 +100,7 @@ public function testConstructorThrowsExceptionIfStreamDoesNotSupportNonBlocking(
         $stream = fopen('blocking://test', 'r+');
         $loop = $this->createLoopMock();
 
-        $this->setExpectedException('RunTimeException');
+        $this->expectException(\RuntimeException::class);
         new DuplexResourceStream($stream, $loop);
     }
 
@@ -111,7 +113,7 @@ public function testConstructorAcceptsBuffer()
         $stream = fopen('php://temp', 'r+');
         $loop = $this->createLoopMock();
 
-        $buffer = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $buffer = $this->createMock(WritableStreamInterface::class);
 
         new DuplexResourceStream($stream, $loop, null, $buffer);
     }
@@ -130,7 +132,7 @@ public function testConstructorThrowsExceptionIfStreamDoesNotSupportNonBlockingW
 
         $buffer = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
-        $this->setExpectedException('RunTimeException');
+        $this->expectException(\RuntimeException::class);
         new DuplexResourceStream($stream, $loop, null, $buffer);
     }
 
@@ -153,7 +155,7 @@ public function testEndShouldEndBuffer()
         $stream = fopen('php://temp', 'r+');
         $loop = $this->createLoopMock();
 
-        $buffer = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $buffer = $this->createMock(WritableStreamInterface::class);
         $buffer->expects($this->once())->method('end')->with('foo');
 
         $conn = new DuplexResourceStream($stream, $loop, null, $buffer);
@@ -166,7 +168,7 @@ public function testEndAfterCloseIsNoOp()
         $stream = fopen('php://temp', 'r+');
         $loop = $this->createLoopMock();
 
-        $buffer = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $buffer = $this->createMock(WritableStreamInterface::class);
         $buffer->expects($this->never())->method('end');
 
         $conn = new DuplexResourceStream($stream, $loop);
@@ -406,7 +408,7 @@ public function testPipeShouldReturnDestination()
         $loop = $this->createLoopMock();
 
         $conn = new DuplexResourceStream($stream, $loop);
-        $dest = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $dest = $this->createMock(WritableStreamInterface::class);
 
         $this->assertSame($dest, $conn->pipe($dest));
     }
@@ -517,6 +519,6 @@ private function createWriteableLoopMock()
 
     private function createLoopMock()
     {
-        return $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        return $this->createMock(LoopInterface::class);
     }
 }
diff --git a/tests/ReadableResourceStreamTest.php b/tests/ReadableResourceStreamTest.php
@@ -2,7 +2,9 @@
 
 namespace React\Tests\Stream;
 
+use React\EventLoop\LoopInterface;
 use React\Stream\ReadableResourceStream;
+use React\Stream\WritableStreamInterface;
 use function Clue\StreamFilter\append as filter_append;
 
 class ReadableResourceStreamTest extends TestCase
@@ -55,7 +57,7 @@ public function testConstructorThrowsExceptionOnInvalidStream()
     {
         $loop = $this->createLoopMock();
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new ReadableResourceStream(false, $loop);
     }
 
@@ -66,7 +68,7 @@ public function testConstructorThrowsExceptionOnWriteOnlyStream()
     {
         $loop = $this->createLoopMock();
 
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new ReadableResourceStream(STDOUT, $loop);
     }
 
@@ -81,7 +83,7 @@ public function testConstructorThrowsExceptionOnWriteOnlyStreamWithExcessiveMode
         unlink($name);
 
         $loop = $this->createLoopMock();
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new ReadableResourceStream($stream, $loop);
     }
 
@@ -97,7 +99,7 @@ public function testConstructorThrowsExceptionIfStreamDoesNotSupportNonBlocking(
         $stream = fopen('blocking://test', 'r+');
         $loop = $this->createLoopMock();
 
-        $this->setExpectedException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         new ReadableResourceStream($stream, $loop);
     }
 
@@ -221,7 +223,7 @@ public function testPipeShouldReturnDestination()
         $loop = $this->createLoopMock();
 
         $conn = new ReadableResourceStream($stream, $loop);
-        $dest = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
+        $dest = $this->createMock(WritableStreamInterface::class);
 
         $this->assertSame($dest, $conn->pipe($dest));
     }
@@ -395,6 +397,6 @@ public function testEmptyReadShouldntFcloseStream()
 
     private function createLoopMock()
     {
-        return $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        return $this->createMock(LoopInterface::class);
     }
 }