Merge pull request #30 from clue-labs/phpunit

jsor · web-flow · commit 2d3e91c8e76d · 2017-12-22T15:57:09.000+01:00
Forward compatiblity with PHPUnit 6
diff --git a/composer.json b/composer.json
@@ -23,6 +23,6 @@
         "react/promise": "~2.1|~1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8"
+        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,10 +2,10 @@
 
 namespace React\Tests\Promise\Timer;
 
+use PHPUnit\Framework\TestCase as BaseTestCase;
 use React\EventLoop\Factory;
-use PHPUnit_Framework_TestCase;
 
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends BaseTestCase
 {
     protected $loop;
 

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace React\Tests\Promise\Timer;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\TestCase as BaseTestCase;`
`5`	`6`	`use React\EventLoop\Factory;`
`6`		`-use PHPUnit_Framework_TestCase;`
`7`	`7`
`8`		`-class TestCase extends PHPUnit_Framework_TestCase`
	`8`	`+class TestCase extends BaseTestCase`
`9`	`9`	`{`
`10`	`10`	`protected $loop;`
`11`	`11`