First pass at PHPUnit v9 support

.gitignore

@@ -2,3 +2,4 @@
 vendor
 .*.swp
 composer.lock
+.phpunit.result.cache

tests/bootstrap.php

@@ -1,13 +1,5 @@
 <?php
 
-require dirname( dirname( __FILE__ ) ) . '/lib/cli/cli.php';
-
-/**
- * Compatibility with PHPUnit 6+
- */
-if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
-	require_once dirname( __FILE__ ) . '/phpunit6-compat.php';
-}
 
 function cli_autoload( $className ) {
 	$className = ltrim($className, '\\');

tests/test-arguments.php

@@ -1,14 +1,15 @@
 <?php
 
 use cli\Arguments;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class TestArguments
  * @todo add more tests to increase coverage
  *
  * @backupGlobals enabled
  */
-class TestArguments extends PHPUnit_Framework_TestCase
+class TestArguments extends TestCase
 {
     /**
      * Array of expected settings
@@ -58,7 +59,7 @@ public static function pushToArgv($args)
     /**
      * Set up valid flags and options
      */
-    public function setUp()
+    public function setUp(): void
     {
         self::clearArgv();
         self::pushToArgv('my_script.php');
@@ -95,7 +96,7 @@ public function setUp()
     /**
      * Tear down fixtures
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->flags = null;
         $this->options = null;

tests/test-cli.php

@@ -2,9 +2,10 @@
 
 use cli\Colors;
 
-class testsCli extends PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+class testsCli extends TestCase {
 
-	function setUp() {
+	function setUp(): void {
 		// Reset enable state
 		\cli\Colors::enable( null );
 

tests/test-colors.php

@@ -1,8 +1,9 @@
 <?php
 
 use cli\Colors;
+use PHPUnit\Framework\TestCase;
 
-class testsColors extends PHPUnit_Framework_TestCase {
+class testsColors extends TestCase {
 
 	/**
      * @dataProvider dataColors

tests/test-shell.php

@@ -1,11 +1,12 @@
 <?php
 
 use cli\Shell;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class TestShell
  */
-class TestShell extends PHPUnit_Framework_TestCase {
+class TestShell extends TestCase {
 
     /**
      * Test getting TERM columns.

tests/test-table-ascii.php

@@ -4,14 +4,15 @@
 use cli\Table;
 use cli\table\Ascii;
 use cli\Colors;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class Test_Table_Ascii
  *
  * Acceptance tests for ASCII table drawing.
  * It will redirect STDOUT to temporary file and check that output matches with expected
  */
-class Test_Table_Ascii extends PHPUnit_Framework_TestCase {
+class Test_Table_Ascii extends TestCase {
 	/**
 	 * @var string Path to temporary file, where STDOUT output will be redirected during tests
 	 */
@@ -24,7 +25,7 @@ class Test_Table_Ascii extends PHPUnit_Framework_TestCase {
 	/**
 	 * Creates instance and redirects STDOUT to temporary file
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		$this->_mockFile = tempnam(sys_get_temp_dir(), 'temp');
 		$resource = fopen($this->_mockFile, 'wb');
 		Streams::setStream('out', $resource);
@@ -36,7 +37,7 @@ public function setUp() {
 	/**
 	 * Cleans temporary file
 	 */
-	public function tearDown() {
+	public function tearDown(): void {
 		if (file_exists($this->_mockFile)) {
 			unlink($this->_mockFile);
 		}

tests/test-table.php

@@ -1,11 +1,12 @@
 <?php
 
 use cli\Colors, cli\Table, cli\Table\Ascii;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for cli\Table
  */
-class Test_Table extends PHPUnit_Framework_TestCase {
+class Test_Table extends TestCase {
 
 	public function test_column_value_too_long_ascii() {