Skip to content

Fix showing coverage data for classes in Clover report #183

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 2 commits into from
Aug 15, 2013
Merged

Fix showing coverage data for classes in Clover report #183

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
87683a1
fix Clover report
alexshadow007 Aug 12, 2013
9ebf5df
update tests
alexshadow007 Aug 13, 2013
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
51 changes: 15 additions & 36 deletions PHP/CodeCoverage/Report/Clover.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,47 +102,26 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
$classStatements = 0;
$coveredClassStatements = 0;
$coveredMethods = 0;
$classMethods = 0;

foreach ($class['methods'] as $methodName => $method) {
$methodCount = 0;
$methodLines = 0;
$methodLinesCovered = 0;
if ($method['executableLines'] == 0)
continue;

$classMethods++;
$classStatements += $method['executableLines'];
$coveredClassStatements += $method['executedLines'];
if ($method['coverage'] == 100){
$coveredMethods++;
}

$methodCount = 0;
for ($i = $method['startLine'];
$i <= $method['endLine'];
$i++) {
$add = TRUE;
$count = 0;

if (isset($coverage[$i])) {
if ($coverage[$i] !== NULL) {
$classStatements++;
$methodLines++;
} else {
$add = FALSE;
}

$count = count($coverage[$i]);

if ($count > 0) {
$coveredClassStatements++;
$methodLinesCovered++;
}
} else {
$add = FALSE;
if (isset($coverage[$i]) && ($coverage[$i] !== NULL)) {
$methodCount = max($methodCount, count($coverage[$i]));
}

$methodCount = max($methodCount, $count);

if ($add) {
$lines[$i] = array(
'count' => $count, 'type' => 'stmt'
);
}
}

if ($methodCount > 0) {
$coveredMethods++;
}

$lines[$method['startLine']] = array(
Expand Down Expand Up @@ -188,7 +167,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
$xmlFile->appendChild($xmlClass);

$xmlMetrics = $xmlDocument->createElement('metrics');
$xmlMetrics->setAttribute('methods', count($class['methods']));
$xmlMetrics->setAttribute('methods', $classMethods);
$xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
$xmlMetrics->setAttribute('conditionals', 0);
$xmlMetrics->setAttribute('coveredconditionals', 0);
Expand All @@ -198,7 +177,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
);
$xmlMetrics->setAttribute(
'elements',
count($class['methods']) +
$classMethods +
$classStatements
/* + conditionals */);
$xmlMetrics->setAttribute(
Expand Down
2 changes: 1 addition & 1 deletion Tests/_files/class-with-anonymous-function-clover.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<project timestamp="%i">
<file name="%s/source_with_class_and_anonymous_function.php">
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
<metrics methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="12" coveredstatements="11" elements="14" coveredelements="13"/>
<metrics methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="5" elements="8" coveredelements="6"/>
</class>
<line num="5" type="method" name="runAnonymous" crap="1.04" count="1"/>
<line num="7" type="stmt" count="1"/>
Expand Down
6 changes: 2 additions & 4 deletions Tests/_files/ignored-lines-clover.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
<project timestamp="%i">
<file name="%s/source_with_ignore.php">
<class name="Foo" namespace="global">
<metrics methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="1" coveredelements="0"/>
<metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
</class>
<class name="Bar" namespace="global">
<metrics methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="1" coveredelements="0"/>
<metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
</class>
<line num="2" type="stmt" count="1"/>
<line num="6" type="stmt" count="0"/>
<line num="13" type="method" name="bar" crap="1" count="0"/>
<line num="23" type="method" name="foo" crap="1" count="0"/>
<metrics loc="38" ncloc="26" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
</file>
<metrics files="1" loc="38" ncloc="26" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
Expand Down