Skip to content

Commit c6cde4a

Browse files
sebastianbergmannsebastianbergmann
committed
Generate <package> element for global namespace
1 parent d3e9e29 commit c6cde4a

5 files changed

+77
-73
lines changed

‎src/Report/Clover.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,20 +185,16 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
185185
$xmlMetrics->setAttribute('coveredelements', (string) ($item->numberOfTestedMethods() + $item->numberOfExecutedLines() + $item->numberOfExecutedBranches()));
186186
$xmlFile->insertBefore($xmlMetrics, $xmlFile->firstChild);
187187

188-
if ($namespace === 'global') {
189-
$xmlProject->appendChild($xmlFile);
190-
} else {
191-
if (!isset($packages[$namespace])) {
192-
$packages[$namespace] = $xmlDocument->createElement(
193-
'package',
194-
);
195-
196-
$packages[$namespace]->setAttribute('name', $namespace);
197-
$xmlProject->appendChild($packages[$namespace]);
198-
}
188+
if (!isset($packages[$namespace])) {
189+
$packages[$namespace] = $xmlDocument->createElement(
190+
'package',
191+
);
199192

200-
$packages[$namespace]->appendChild($xmlFile);
193+
$packages[$namespace]->setAttribute('name', $namespace);
194+
$xmlProject->appendChild($packages[$namespace]);
201195
}
196+
197+
$packages[$namespace]->appendChild($xmlFile);
202198
}
203199

204200
$linesOfCode = $report->linesOfCode();

‎tests/_files/BankAccount-clover-line.xml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i" name="BankAccount">
44
<metrics files="1" loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
5-
<file name="BankAccount.php" path="%s%eBankAccount.php">
6-
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
7-
<class name="BankAccount" namespace="global">
8-
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
9-
</class>
10-
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
11-
<line num="8" type="stmt" count="2"/>
12-
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
13-
<line num="13" type="stmt" count="0"/>
14-
<line num="14" type="stmt" count="0"/>
15-
<line num="16" type="stmt" count="0"/>
16-
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
17-
<line num="22" type="stmt" count="2"/>
18-
<line num="24" type="stmt" count="1"/>
19-
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
20-
<line num="29" type="stmt" count="2"/>
21-
<line num="31" type="stmt" count="1"/>
22-
</file>
5+
<package name="global">
6+
<file name="BankAccount.php" path="%s%eBankAccount.php">
7+
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
8+
<class name="BankAccount" namespace="global">
9+
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
10+
</class>
11+
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
12+
<line num="8" type="stmt" count="2"/>
13+
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
14+
<line num="13" type="stmt" count="0"/>
15+
<line num="14" type="stmt" count="0"/>
16+
<line num="16" type="stmt" count="0"/>
17+
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
18+
<line num="22" type="stmt" count="2"/>
19+
<line num="24" type="stmt" count="1"/>
20+
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
21+
<line num="29" type="stmt" count="2"/>
22+
<line num="31" type="stmt" count="1"/>
23+
</file>
24+
</package>
2325
</project>
2426
</coverage>

‎tests/_files/BankAccount-clover-path.xml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i" name="BankAccount">
44
<metrics files="1" loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
5-
<file name="BankAccount.php" path="%s%eBankAccount.php">
6-
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
7-
<class name="BankAccount" namespace="global">
8-
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
9-
</class>
10-
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
11-
<line num="8" type="stmt" count="2"/>
12-
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
13-
<line num="13" type="stmt" count="0"/>
14-
<line num="14" type="stmt" count="0"/>
15-
<line num="16" type="stmt" count="0"/>
16-
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
17-
<line num="22" type="stmt" count="2"/>
18-
<line num="24" type="stmt" count="1"/>
19-
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
20-
<line num="29" type="stmt" count="2"/>
21-
<line num="31" type="stmt" count="1"/>
22-
</file>
5+
<package name="global">
6+
<file name="BankAccount.php" path="%s%eBankAccount.php">
7+
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
8+
<class name="BankAccount" namespace="global">
9+
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
10+
</class>
11+
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
12+
<line num="8" type="stmt" count="2"/>
13+
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
14+
<line num="13" type="stmt" count="0"/>
15+
<line num="14" type="stmt" count="0"/>
16+
<line num="16" type="stmt" count="0"/>
17+
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
18+
<line num="22" type="stmt" count="2"/>
19+
<line num="24" type="stmt" count="1"/>
20+
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
21+
<line num="29" type="stmt" count="2"/>
22+
<line num="31" type="stmt" count="1"/>
23+
</file>
24+
</package>
2325
</project>
2426
</coverage>

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i">
44
<metrics files="1" loc="20" ncloc="19" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
5-
<file name="source_with_class_and_anonymous_function.php" path="%s%esource_with_class_and_anonymous_function.php">
6-
<metrics loc="20" ncloc="19" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
7-
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
8-
<metrics complexity="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
9-
</class>
10-
<line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1" count="1"/>
11-
<line num="7" type="stmt" count="1"/>
12-
<line num="9" type="stmt" count="1"/>
13-
<line num="10" type="stmt" count="1"/>
14-
<line num="11" type="stmt" count="1"/>
15-
<line num="12" type="stmt" count="1"/>
16-
<line num="13" type="stmt" count="1"/>
17-
<line num="14" type="stmt" count="1"/>
18-
<line num="17" type="stmt" count="1"/>
19-
</file>
5+
<package name="global">
6+
<file name="source_with_class_and_anonymous_function.php" path="%s%esource_with_class_and_anonymous_function.php">
7+
<metrics loc="20" ncloc="19" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
8+
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
9+
<metrics complexity="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
10+
</class>
11+
<line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1" count="1"/>
12+
<line num="7" type="stmt" count="1"/>
13+
<line num="9" type="stmt" count="1"/>
14+
<line num="10" type="stmt" count="1"/>
15+
<line num="11" type="stmt" count="1"/>
16+
<line num="12" type="stmt" count="1"/>
17+
<line num="13" type="stmt" count="1"/>
18+
<line num="14" type="stmt" count="1"/>
19+
<line num="17" type="stmt" count="1"/>
20+
</file>
21+
</package>
2022
</project>
2123
</coverage>

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i">
44
<metrics files="1" loc="43" ncloc="32" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="1" coveredelements="1"/>
5-
<file name="source_with_ignore.php" path="%s%esource_with_ignore.php">
6-
<metrics loc="43" ncloc="32" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="1" coveredelements="1"/>
7-
<class name="Foo" namespace="global">
8-
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
9-
</class>
10-
<class name="Bar" namespace="global">
11-
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
12-
</class>
13-
<line num="2" type="stmt" count="1"/>
14-
</file>
5+
<package name="global">
6+
<file name="source_with_ignore.php" path="%s%esource_with_ignore.php">
7+
<metrics loc="43" ncloc="32" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="1" coveredelements="1"/>
8+
<class name="Foo" namespace="global">
9+
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
10+
</class>
11+
<class name="Bar" namespace="global">
12+
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
13+
</class>
14+
<line num="2" type="stmt" count="1"/>
15+
</file>
16+
</package>
1517
</project>
1618
</coverage>

0 commit comments

Comments
 (0)