Add support for phpunit 9.3

Author: Nicolas Reynis

composer.json

@@ -5,8 +5,8 @@
   "require": {
     "php": "^7.3",
     "webmozart/assert": "^1.2",
-    "phpunit/php-code-coverage": "^8.0",
-    "phpunit/phpunit": "^9.0"
+    "phpunit/php-code-coverage": "^9.0",
+    "phpunit/phpunit": "^9.3"
   },
   "autoload": {
     "psr-4": {

src/LiveCodeCoverage/CodeCoverageFactory.php

@@ -2,9 +2,11 @@
 
 namespace LiveCodeCoverage;
 
-use PHPUnit\TextUI\Configuration\Configuration;
-use PHPUnit\TextUI\Configuration\Loader;
+use PHPUnit\TextUI\XmlConfiguration\Configuration;
+use PHPUnit\TextUI\XmlConfiguration\Loader;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Driver\Selector;
+use SebastianBergmann\CodeCoverage\Filter;
 
 final class CodeCoverageFactory
 {
@@ -25,42 +27,45 @@ public static function createFromPhpUnitConfiguration($phpunitFilePath)
     private static function configure(CodeCoverage $codeCoverage, Configuration $configuration)
     {
         $codeCoverageFilter = $codeCoverage->filter();
-        $filterConfiguration = $configuration->filter();
+        $codeCoverageConfiguration = $configuration->codeCoverage();
 
         // The following code is copied from PHPUnit\TextUI\TestRunner
+        if ($codeCoverageConfiguration->hasNonEmptyListOfFilesToBeIncludedInCodeCoverageReport()) {
+            if ($codeCoverageConfiguration->includeUncoveredFiles()) {
+                $codeCoverage->includeUncoveredFiles();
+            } else {
+                $codeCoverage->excludeUncoveredFiles();
+            }
 
-        if ($filterConfiguration->hasNonEmptyWhitelist()) {
-            $codeCoverage->setAddUncoveredFilesFromWhitelist(
-                $filterConfiguration->addUncoveredFilesFromWhitelist()
-            );
-
-            $codeCoverage->setProcessUncoveredFilesFromWhitelist(
-                $filterConfiguration->processUncoveredFilesFromWhitelist()
-            );
+            if ($codeCoverageConfiguration->processUncoveredFiles()) {
+                $codeCoverage->processUncoveredFiles();
+            } else {
+                $codeCoverage->doNotProcessUncoveredFiles();
+            }
         }
 
-        foreach ($filterConfiguration->directories() as $directory) {
-            $codeCoverageFilter->addDirectoryToWhitelist(
+        foreach ($codeCoverageConfiguration->directories() as $directory) {
+            $codeCoverageFilter->includeDirectory(
                 $directory->path(),
                 $directory->suffix(),
                 $directory->prefix()
             );
         }
 
-        foreach ($filterConfiguration->files() as $file) {
-            $codeCoverageFilter->addFileToWhitelist($file->path());
+        foreach ($codeCoverageConfiguration->files() as $file) {
+            $codeCoverageFilter->includeFile($file->path());
         }
 
-        foreach ($filterConfiguration->excludeDirectories() as $directory) {
-            $codeCoverageFilter->removeDirectoryFromWhitelist(
+        foreach ($codeCoverageConfiguration->excludeDirectories() as $directory) {
+            $codeCoverageFilter->excludeDirectory(
                 $directory->path(),
                 $directory->suffix(),
                 $directory->prefix()
             );
         }
 
-        foreach ($filterConfiguration->excludeFiles() as $file) {
-            $codeCoverageFilter->removeFileFromWhitelist($file->path());
+        foreach ($codeCoverageConfiguration->excludeFiles() as $file) {
+            $codeCoverageFilter->excludeFile($file->path());
         }
 
     }
@@ -70,6 +75,9 @@ private static function configure(CodeCoverage $codeCoverage, Configuration $con
      */
     public static function createDefault()
     {
-        return new CodeCoverage();
+        $filter = new Filter();
+        $driverSelector = new Selector();
+        $driver = $driverSelector->forLineCoverage($filter);
+        return new CodeCoverage($driver, $filter);
     }
 }