Skip to content

Commit 91387b8

Browse files
Maks3wMaks3w
committed
Clover report. Fill Agregate
1 parent 4bc19d0 commit 91387b8

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎src/CodeCoverage/Report/Clover.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
136136
$xmlMetrics->setAttribute('complexity', $class['ccn']);
137137
$xmlMetrics->setAttribute('methods', $classMethods);
138138
$xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
139-
$xmlMetrics->setAttribute('conditionals', 0);
140-
$xmlMetrics->setAttribute('coveredconditionals', 0);
139+
$xmlMetrics->setAttribute('conditionals', $class['executablePaths']);
140+
$xmlMetrics->setAttribute('coveredconditionals', $class['executedPaths']);
141141
$xmlMetrics->setAttribute('statements', $classStatements);
142142
$xmlMetrics->setAttribute(
143143
'coveredstatements',
@@ -206,8 +206,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
206206
'coveredmethods',
207207
$item->getNumTestedMethods()
208208
);
209-
$xmlMetrics->setAttribute('conditionals', 0);
210-
$xmlMetrics->setAttribute('coveredconditionals', 0);
209+
$xmlMetrics->setAttribute('conditionals', $item->getNumExecutablePaths());
210+
$xmlMetrics->setAttribute('coveredconditionals', $item->getNumExecutedPaths());
211211
$xmlMetrics->setAttribute(
212212
'statements',
213213
$item->getNumExecutableLines()
@@ -259,8 +259,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
259259
'coveredmethods',
260260
$report->getNumTestedMethods()
261261
);
262-
$xmlMetrics->setAttribute('conditionals', 0);
263-
$xmlMetrics->setAttribute('coveredconditionals', 0);
262+
$xmlMetrics->setAttribute('conditionals', $report->getNumExecutablePaths());
263+
$xmlMetrics->setAttribute('coveredconditionals', $report->getNumExecutedPaths());
264264
$xmlMetrics->setAttribute(
265265
'statements',
266266
$report->getNumExecutableLines()

‎tests/_files/BankAccount-clover.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<project timestamp="%i" name="BankAccount">
44
<file name="%s/BankAccount.php">
55
<class name="BankAccount" namespace="global">
6-
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
6+
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="5" coveredconditionals="1" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
77
</class>
88
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
99
<line num="8" type="stmt" count="2"/>
@@ -19,8 +19,8 @@
1919
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
2020
<line num="29" type="stmt" count="2"/>
2121
<line num="31" type="stmt" count="1"/>
22-
<metrics loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
22+
<metrics loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="5" coveredconditionals="1" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
2323
</file>
24-
<metrics files="1" loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
24+
<metrics files="1" loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="5" coveredconditionals="1" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
2525
</project>
2626
</coverage>

‎tests/_files/class-with-anonymous-function-clover.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<project timestamp="%i">
44
<file name="%s/source_with_class_and_anonymous_function.php">
55
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
6-
<metrics complexity="2" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
6+
<metrics complexity="2" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
77
</class>
88
<line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1.04" count="1"/>
99
<line num="7" type="stmt" count="1"/>
@@ -15,8 +15,8 @@
1515
<line num="14" type="stmt" count="1"/>
1616
<line num="17" type="stmt" count="1"/>
1717
<line num="18" type="stmt" count="1"/>
18-
<metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
18+
<metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
1919
</file>
20-
<metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
20+
<metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
2121
</project>
2222
</coverage>

‎tests/_files/ignored-lines-clover.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<project timestamp="%i">
44
<file name="%s/source_with_ignore.php">
55
<class name="Foo" namespace="global">
6-
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
6+
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="1" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
77
</class>
88
<class name="Bar" namespace="global">
9-
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
9+
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="1" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
1010
</class>
1111
<line num="2" type="stmt" count="1"/>
1212
<line num="6" type="stmt" count="0"/>
13-
<metrics loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
13+
<metrics loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="3" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
1414
</file>
15-
<metrics files="1" loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
15+
<metrics files="1" loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="3" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
1616
</project>
1717
</coverage>

0 commit comments

Comments
 (0)