Compatibility with PHPUnit v5

Author: thklein

composer.json

@@ -19,6 +19,6 @@
     },
     "require-dev": {
         "react/event-loop": " ^0.4 || ^0.3",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^5.0 || ^4.8"
     }
 }

tests/DecoderTest.php

@@ -180,7 +180,7 @@ public function testEmitErrorEventWillForwardAndClose()
 
     public function testPipeReturnsDestStream()
     {
-        $dest = $this->getMock('React\Stream\WritableStreamInterface');
+        $dest = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
         $ret = $this->decoder->pipe($dest);
 
@@ -189,7 +189,7 @@ public function testPipeReturnsDestStream()
 
     public function testForwardPauseToInput()
     {
-        $this->input = $this->getMock('React\Stream\ReadableStreamInterface');
+        $this->input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $this->input->expects($this->once())->method('pause');
 
         $this->decoder = new Decoder($this->input);
@@ -198,7 +198,7 @@ public function testForwardPauseToInput()
 
     public function testForwardResumeToInput()
     {
-        $this->input = $this->getMock('React\Stream\ReadableStreamInterface');
+        $this->input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $this->input->expects($this->once())->method('resume');
 
         $this->decoder = new Decoder($this->input);

tests/EncoderTest.php

@@ -28,7 +28,7 @@ public function testPrettyPrintDoesNotMakeSenseForNDJson()
 
     public function testWriteString()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(true);
         $this->encoder = new Encoder($this->output);
 
@@ -39,7 +39,7 @@ public function testWriteString()
 
     public function testWriteNull()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(true);
         $this->encoder = new Encoder($this->output);
 
@@ -50,7 +50,7 @@ public function testWriteNull()
 
     public function testWriteInfiniteWillEmitErrorAndClose()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(true);
         $this->encoder = new Encoder($this->output);
 
@@ -66,7 +66,7 @@ public function testWriteInfiniteWillEmitErrorAndClose()
 
     public function testEndWithoutDataWillEndOutputWithoutData()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(true);
         $this->encoder = new Encoder($this->output);
 
@@ -78,7 +78,7 @@ public function testEndWithoutDataWillEndOutputWithoutData()
 
     public function testEndWithDataWillForwardDataAndEndOutputWithoutData()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(true);
         $this->encoder = new Encoder($this->output);
 
@@ -106,7 +106,7 @@ public function testClosingOutputClosesEncoder()
 
     public function testPassingClosedStreamToEncoderWillCloseImmediately()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(false);
         $this->encoder = new Encoder($this->output);
 
@@ -115,7 +115,7 @@ public function testPassingClosedStreamToEncoderWillCloseImmediately()
 
     public function testWritingToClosedStreamWillNotForwardData()
     {
-        $this->output = $this->getMock('React\Stream\WritableStreamInterface');
+        $this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
         $this->output->expects($this->once())->method('isWritable')->willReturn(false);
         $this->encoder = new Encoder($this->output);
 

tests/bootstrap.php

@@ -53,7 +53,7 @@ protected function expectCallableOnceParameter($type)
      */
     protected function createCallableMock()
     {
-        return $this->getMock('CallableStub');
+        return $this->getMockBuilder('CallableStub')->getMock();
     }
 }