Merge pull request #120 from gabriel-caruso/phpunit

jsor · web-flow · commit 61e3e65c7dff · 2017-11-15T19:57:46.000+01:00
Forward compatibility with PHPUnit 6 and PHPUnit 5
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "php": ">=5.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "~4.8.35 || ^5.7 || ^6.4"
     },
     "suggest": {
         "ext-libevent": ">=0.1.0 for LibEventLoop and PHP5 only",
diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
@@ -154,7 +154,9 @@ protected function forkSendSignal($signal)
     public function testSmallTimerInterval()
     {
         /** @var StreamSelectLoop|\PHPUnit_Framework_MockObject_MockObject $loop */
-        $loop = $this->getMock('React\EventLoop\StreamSelectLoop', ['streamSelect']);
+        $loop = $this->getMockBuilder('React\EventLoop\StreamSelectLoop')
+                    ->setMethods(['streamSelect'])
+                    ->getMock();
         $loop
             ->expects($this->at(0))
             ->method('streamSelect')
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,9 +2,10 @@
 
 namespace React\Tests\EventLoop;
 
+use PHPUnit\Framework\TestCase as BaseTestCase;
 use React\EventLoop\LoopInterface;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends BaseTestCase
 {
     protected function expectCallableExactly($amount)
     {

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace React\Tests\EventLoop;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\TestCase as BaseTestCase;`
`5`	`6`	`use React\EventLoop\LoopInterface;`
`6`	`7`
`7`		`-class TestCase extends \PHPUnit_Framework_TestCase`
	`8`	`+class TestCase extends BaseTestCase`
`8`	`9`	`{`
`9`	`10`	`protected function expectCallableExactly($amount)`
`10`	`11`	`{`