Skip to content

Add support for phpunit 9.3 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2020
Merged

Add support for phpunit 9.3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
48 changes: 28 additions & 20 deletions src/LiveCodeCoverage/CodeCoverageFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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());
}

}
Expand All @@ -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);
}
}