Skip to content

Commit 6efd9f6

Browse files
Make <metrics> element the first child of <project> and <file>
1 parent 40f7682 commit 6efd9f6

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/Report/Clover.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
127127
$xmlMetrics->setAttribute('coveredstatements', (string) $coveredClassStatements);
128128
$xmlMetrics->setAttribute('elements', (string) ($classMethods + $classStatements + $class['executableBranches']));
129129
$xmlMetrics->setAttribute('coveredelements', (string) ($coveredMethods + $coveredClassStatements + $class['executedBranches']));
130-
$xmlClass->appendChild($xmlMetrics);
130+
$xmlClass->insertBefore($xmlMetrics, $xmlClass->firstChild);
131131
}
132132

133133
foreach ($coverageData as $line => $data) {
@@ -181,7 +181,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
181181
$xmlMetrics->setAttribute('coveredstatements', (string) $item->numberOfExecutedLines());
182182
$xmlMetrics->setAttribute('elements', (string) ($item->numberOfMethods() + $item->numberOfExecutableLines() + $item->numberOfExecutableBranches()));
183183
$xmlMetrics->setAttribute('coveredelements', (string) ($item->numberOfTestedMethods() + $item->numberOfExecutedLines() + $item->numberOfExecutedBranches()));
184-
$xmlFile->appendChild($xmlMetrics);
184+
$xmlFile->insertBefore($xmlMetrics, $xmlFile->firstChild);
185185

186186
if ($namespace === 'global') {
187187
$xmlProject->appendChild($xmlFile);
@@ -214,7 +214,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
214214
$xmlMetrics->setAttribute('coveredstatements', (string) $report->numberOfExecutedLines());
215215
$xmlMetrics->setAttribute('elements', (string) ($report->numberOfMethods() + $report->numberOfExecutableLines() + $report->numberOfExecutableBranches()));
216216
$xmlMetrics->setAttribute('coveredelements', (string) ($report->numberOfTestedMethods() + $report->numberOfExecutedLines() + $report->numberOfExecutedBranches()));
217-
$xmlProject->appendChild($xmlMetrics);
217+
$xmlProject->insertBefore($xmlMetrics, $xmlProject->firstChild);
218218

219219
$buffer = $xmlDocument->saveXML();
220220

tests/_files/BankAccount-clover-line.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i" name="BankAccount">
4+
<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"/>
45
<file name="%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"/>
57
<class name="BankAccount" namespace="global">
68
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
79
</class>
@@ -17,8 +19,6 @@
1719
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
1820
<line num="29" type="stmt" count="2"/>
1921
<line num="31" type="stmt" count="1"/>
20-
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
2122
</file>
22-
<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"/>
2323
</project>
2424
</coverage>

tests/_files/BankAccount-clover-path.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i" name="BankAccount">
4+
<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"/>
45
<file name="%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"/>
57
<class name="BankAccount" namespace="global">
68
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
79
</class>
@@ -17,8 +19,6 @@
1719
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
1820
<line num="29" type="stmt" count="2"/>
1921
<line num="31" type="stmt" count="1"/>
20-
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
2122
</file>
22-
<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"/>
2323
</project>
2424
</coverage>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i">
4+
<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"/>
45
<file name="%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"/>
57
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
68
<metrics complexity="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
79
</class>
@@ -14,8 +16,6 @@
1416
<line num="13" type="stmt" count="1"/>
1517
<line num="14" type="stmt" count="1"/>
1618
<line num="17" type="stmt" count="1"/>
17-
<metrics loc="20" ncloc="19" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="8" elements="9" coveredelements="9"/>
1819
</file>
19-
<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"/>
2020
</project>
2121
</coverage>

tests/_files/ignored-lines-clover.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<coverage clover="%s" generated="%i">
33
<project timestamp="%i">
4+
<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"/>
45
<file name="%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"/>
57
<class name="Foo" namespace="global">
68
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
79
</class>
810
<class name="Bar" namespace="global">
911
<metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
1012
</class>
1113
<line num="2" type="stmt" count="1"/>
12-
<metrics loc="43" ncloc="32" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="1" coveredelements="1"/>
1314
</file>
14-
<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"/>
1515
</project>
1616
</coverage>

0 commit comments

Comments
 (0)