Skip to content

Properly mark untested functions and lines as not covered #1078

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

Closed
wants to merge 2 commits into from
Closed

Properly mark untested functions and lines as not covered #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
520798a
Fix coverage calculation bug
gufoe May 16, 2025
11f881b
Fix coverage calculation bug for lines
gufoe May 16, 2025
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
5 changes: 5 additions & 0 deletions src/CodeCoverage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,4 +644,9 @@ private function analyser(): FileAnalyser

return $this->analyser;
}

public function clearAnalyser(): void
{
$this->analyser = null;
}
}
1 change: 1 addition & 0 deletions src/Node/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ private function addItems(Directory $root, array $items, array $tests): void
$analysisResult->traits(),
$analysisResult->functions(),
$analysisResult->linesOfCode(),
$analysisResult->executableLines(),
),
);
}
Expand Down
65 changes: 42 additions & 23 deletions src/Node/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,21 +140,28 @@ final class File extends AbstractNode
*/
private array $codeUnitsByLine = [];

/**
* @var array<int, int>
*/
private array $executableLinesGroupedByBranch = [];

/**
* @param array<int, ?list<non-empty-string>> $lineCoverageData
* @param array<string, TestType> $testData
* @param array<string, Class_> $classes
* @param array<string, Trait_> $traits
* @param array<string, Function_> $functions
* @param array<int, int> $executableLinesGroupedByBranch
*/
public function __construct(string $name, AbstractNode $parent, array $lineCoverageData, array $functionCoverageData, array $testData, array $classes, array $traits, array $functions, LinesOfCode $linesOfCode)
public function __construct(string $name, AbstractNode $parent, array $lineCoverageData, array $functionCoverageData, array $testData, array $classes, array $traits, array $functions, LinesOfCode $linesOfCode, array $executableLinesGroupedByBranch)
{
parent::__construct($name, $parent);

$this->lineCoverageData = $lineCoverageData;
$this->lineCoverageData = $lineCoverageData;
$this->functionCoverageData = $functionCoverageData;
$this->testData = $testData;
$this->linesOfCode = $linesOfCode;
$this->testData = $testData;
$this->linesOfCode = $linesOfCode;
$this->executableLinesGroupedByBranch = $executableLinesGroupedByBranch;

$this->calculateStatistics($classes, $traits, $functions);
}
Expand Down Expand Up @@ -299,17 +306,13 @@ public function numberOfMethods(): int

foreach ($this->classes as $class) {
foreach ($class['methods'] as $method) {
if ($method['executableLines'] > 0) {
$this->numMethods++;
}
$this->numMethods++;
}
}

foreach ($this->traits as $trait) {
foreach ($trait['methods'] as $method) {
if ($method['executableLines'] > 0) {
$this->numMethods++;
}
$this->numMethods++;
}
}
}
Expand All @@ -324,17 +327,15 @@ public function numberOfTestedMethods(): int

foreach ($this->classes as $class) {
foreach ($class['methods'] as $method) {
if ($method['executableLines'] > 0 &&
$method['coverage'] === 100) {
if ($method['coverage'] === 100) {
$this->numTestedMethods++;
}
}
}

foreach ($this->traits as $trait) {
foreach ($trait['methods'] as $method) {
if ($method['executableLines'] > 0 &&
$method['coverage'] === 100) {
if ($method['coverage'] === 100) {
$this->numTestedMethods++;
}
}
Expand Down Expand Up @@ -380,19 +381,26 @@ private function calculateStatistics(array $classes, array $traits, array $funct
$this->processTraits($traits);
$this->processFunctions($functions);

// Get executable lines from the ExecutableLinesFindingVisitor
$executableLines = $this->executableLinesGroupedByBranch();

foreach (range(1, $this->linesOfCode->linesOfCode()) as $lineNumber) {
if (isset($this->lineCoverageData[$lineNumber])) {
if (isset($executableLines[$lineNumber])) {
foreach ($this->codeUnitsByLine[$lineNumber] as &$codeUnit) {
$codeUnit['executableLines']++;
if (isset($codeUnit['executableLines'])) {
$codeUnit['executableLines']++;
}
}

unset($codeUnit);

$this->numExecutableLines++;

if (count($this->lineCoverageData[$lineNumber]) > 0) {
if (isset($this->lineCoverageData[$lineNumber]) && count($this->lineCoverageData[$lineNumber] ?? []) > 0) {
foreach ($this->codeUnitsByLine[$lineNumber] as &$codeUnit) {
$codeUnit['executedLines']++;
if (isset($codeUnit['executedLines'])) {
$codeUnit['executedLines']++;
}
}

unset($codeUnit);
Expand All @@ -404,7 +412,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct

foreach ($this->traits as &$trait) {
foreach ($trait['methods'] as &$method) {
$methodLineCoverage = $method['executableLines'] > 0 ? ($method['executedLines'] / $method['executableLines']) * 100 : 100;
$methodLineCoverage = $method['executableLines'] > 0 ? ($method['executedLines'] / $method['executableLines']) * 100 : 0;
$methodBranchCoverage = $method['executableBranches'] > 0 ? ($method['executedBranches'] / $method['executableBranches']) * 100 : 0;
$methodPathCoverage = $method['executablePaths'] > 0 ? ($method['executedPaths'] / $method['executablePaths']) * 100 : 0;

Expand All @@ -416,7 +424,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct

unset($method);

$traitLineCoverage = $trait['executableLines'] > 0 ? ($trait['executedLines'] / $trait['executableLines']) * 100 : 100;
$traitLineCoverage = $trait['executableLines'] > 0 ? ($trait['executedLines'] / $trait['executableLines']) * 100 : 0;
$traitBranchCoverage = $trait['executableBranches'] > 0 ? ($trait['executedBranches'] / $trait['executableBranches']) * 100 : 0;
$traitPathCoverage = $trait['executablePaths'] > 0 ? ($trait['executedPaths'] / $trait['executablePaths']) * 100 : 0;

Expand All @@ -432,7 +440,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct

foreach ($this->classes as &$class) {
foreach ($class['methods'] as &$method) {
$methodLineCoverage = $method['executableLines'] > 0 ? ($method['executedLines'] / $method['executableLines']) * 100 : 100;
$methodLineCoverage = $method['executableLines'] > 0 ? ($method['executedLines'] / $method['executableLines']) * 100 : 0;
$methodBranchCoverage = $method['executableBranches'] > 0 ? ($method['executedBranches'] / $method['executableBranches']) * 100 : 0;
$methodPathCoverage = $method['executablePaths'] > 0 ? ($method['executedPaths'] / $method['executablePaths']) * 100 : 0;

Expand All @@ -444,7 +452,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct

unset($method);

$classLineCoverage = $class['executableLines'] > 0 ? ($class['executedLines'] / $class['executableLines']) * 100 : 100;
$classLineCoverage = $class['executableLines'] > 0 ? ($class['executedLines'] / $class['executableLines']) * 100 : 0;
$classBranchCoverage = $class['executableBranches'] > 0 ? ($class['executedBranches'] / $class['executableBranches']) * 100 : 0;
$classPathCoverage = $class['executablePaths'] > 0 ? ($class['executedPaths'] / $class['executablePaths']) * 100 : 0;

Expand All @@ -459,7 +467,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct
unset($class);

foreach ($this->functions as &$function) {
$functionLineCoverage = $function['executableLines'] > 0 ? ($function['executedLines'] / $function['executableLines']) * 100 : 100;
$functionLineCoverage = $function['executableLines'] > 0 ? ($function['executedLines'] / $function['executableLines']) * 100 : 0;
$functionBranchCoverage = $function['executableBranches'] > 0 ? ($function['executedBranches'] / $function['executableBranches']) * 100 : 0;
$functionPathCoverage = $function['executablePaths'] > 0 ? ($function['executedPaths'] / $function['executablePaths']) * 100 : 0;

Expand Down Expand Up @@ -664,6 +672,9 @@ private function newMethod(string $className, Method $method, string $link): arr

$key = $className . '->' . $method->name();

// Initialize executable lines based on the method's body
// (Removed increment and debug output here)

if (isset($this->functionCoverageData[$key]['branches'])) {
$methodData['executableBranches'] = count(
$this->functionCoverageData[$key]['branches'],
Expand Down Expand Up @@ -698,4 +709,12 @@ static function (array $path)

return $methodData;
}

/**
* @return array<int, int>
*/
private function executableLinesGroupedByBranch(): array
{
return $this->executableLinesGroupedByBranch;
}
}
2 changes: 1 addition & 1 deletion src/Util/Percentage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function asFloat(): float
return ($this->fraction / $this->total) * 100;
}

return 100.0;
return 0.0;
}

public function asString(): string
Expand Down
Loading