Compatiblility with PHPUnit v5

Author: clue

composer.json

@@ -23,6 +23,6 @@
         "react/promise": "~2.1|~1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^5.0 || ^4.8"
     }
 }

tests/FunctionResolveTest.php

@@ -40,17 +40,17 @@ public function testPromiseExpiredWillBeResolvedOnTimeout()
 
     public function testWillStartLoopTimer()
     {
-        $loop = $this->getMock('React\EventLoop\LoopInterface');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
         $loop->expects($this->once())->method('addTimer')->with($this->equalTo(0.01));
 
         Timer\resolve(0.01, $loop);
     }
 
     public function testCancellingPromiseWillCancelLoopTimer()
     {
-        $loop = $this->getMock('React\EventLoop\LoopInterface');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
 
-        $timer = $this->getMock('React\EventLoop\Timer\TimerInterface');
+        $timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
         $loop->expects($this->once())->method('addTimer')->will($this->returnValue($timer));
 
         $promise = Timer\resolve(0.01, $loop);

tests/FunctionTimeoutTest.php

@@ -62,7 +62,7 @@ public function testRejectedWillNotStartTimer()
 
     public function testPendingWillRejectOnTimeout()
     {
-        $promise = $this->getMock('React\Promise\PromiseInterface');
+        $promise = $this->getMockBuilder('React\Promise\PromiseInterface')->getMock();
 
         $promise = Timer\timeout($promise, 0.01, $this->loop);
 
@@ -73,7 +73,7 @@ public function testPendingWillRejectOnTimeout()
 
     public function testPendingCancellableWillBeCancelledOnTimeout()
     {
-        $promise = $this->getMock('React\Promise\CancellablePromiseInterface');
+        $promise = $this->getMockBuilder('React\Promise\CancellablePromiseInterface')->getMock();
         $promise->expects($this->once())->method('cancel');
 
         Timer\timeout($promise, 0.01, $this->loop);
@@ -85,9 +85,9 @@ public function testCancelTimeoutWithoutCancellationhandlerWillNotCancelTimerAnd
     {
         $promise = new \React\Promise\Promise(function () { });
 
-        $loop = $this->getMock('React\EventLoop\LoopInterface');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
 
-        $timer = $this->getMock('React\EventLoop\Timer\TimerInterface');
+        $timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
         $loop->expects($this->once())->method('addTimer')->will($this->returnValue($timer));
         $loop->expects($this->never())->method('cancelTimer');
 

tests/TestCase.php

@@ -41,7 +41,7 @@ protected function expectCallableNever()
      */
     protected function createCallableMock()
     {
-        return $this->getMock('React\Tests\Promise\Timer\CallableStub');
+        return $this->getMockBuilder('React\Tests\Promise\Timer\CallableStub')->getMock();
     }
 
     protected function expectPromiseRejected($promise)