Update the test suite

.gitattributes

@@ -4,4 +4,4 @@
 .gitignore export-ignore
 .travis.yml export-ignore
 build.xml export-ignore
-phpunit.xml export-ignore
+phpunit.xml.dist export-ignore

.gitignore

@@ -1,4 +1,6 @@
 /.idea/
 /build/
 /vendor/
-/composer.lock
+/composer.lock
+phpunit.xml
+.phpunit.result.cache

build.xml

@@ -64,8 +64,8 @@
     <target name="phpunit" depends="prepare" description="PHP unit">
         <delete file="${basedir}/build/logs/phpunit.xml" quiet="true" />
 
-        <exec executable="${phpunit}">
-            <arg line='--configuration ${basedir}/phpunit.xml' />
+        <exec executable="${phpunit}" failonerror="true">
+            <arg line='--configuration ${basedir}/phpunit.xml.dist' />
             <arg line='-d memory_limit=256M' />
             <arg line='--log-junit "${basedir}/build/logs/phpunit.xml"' />
             <arg line='${colors-arg.color}' />
@@ -79,7 +79,7 @@
         <mkdir dir="${basedir}/build/coverage" />
 
         <exec executable="${phpunit}" failonerror="true">
-            <arg line='--configuration ${basedir}/phpunit.xml' />
+            <arg line='--configuration ${basedir}/phpunit.xml.dist' />
             <arg line='-d memory_limit=256M' />
             <arg line='--log-junit "${basedir}/build/logs/phpunit.xml"' />
             <arg line='--coverage-clover "${basedir}/build/logs/clover.xml"' />

composer.json

@@ -19,7 +19,7 @@
         "php-parallel-lint/php-console-color": "^0.2 || ^0.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36",
+        "phpunit/phpunit": "^4.8.36 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "php-parallel-lint/php-parallel-lint": "^1.0",
         "php-parallel-lint/php-var-dump-check": "0.*",
         "squizlabs/php_codesniffer": "^3.5",

phpunit.xml.dist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    backupGlobals="true"
+    bootstrap="./vendor/autoload.php"
+    colors="true">
+
+    <testsuites>
+        <testsuite name="PHP-Console-Highlighter">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+
+</phpunit>

tests/HigligterTest.php → tests/HighlighterTest.php

@@ -27,15 +27,21 @@ protected function getConsoleColorMock()
         return $mock;
     }
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function setUpHighlighter()
     {
         $this->uut = new Highlighter($this->getConsoleColorMock());
     }
 
     protected function compare($original, $expected)
     {
         $output = $this->uut->getWholeFile($original);
-        $this->assertEquals($expected, $output);
+        // Allow unit tests to succeed on non-*nix systems.
+        $output = str_replace(array("\r\n", "\r"), "\n", $output);
+
+        $this->assertSame($expected, $output);
     }
 
     public function testVariable()