Line coverage of methods should reflect actual coverage

Author: bastien-phi

src/Report/Cobertura.php

@@ -12,7 +12,6 @@
 use function count;
 use function dirname;
 use function file_put_contents;
-use function max;
 use function range;
 use function time;
 use DOMImplementation;
@@ -153,20 +152,6 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
                         continue;
                     }
 
-                    $methodCount = 0;
-
-                    foreach (range($method['startLine'], $method['endLine']) as $line) {
-                        if (isset($coverageData[$line]) && $coverageData[$line] !== null) {
-                            $methodCount = max($methodCount, count($coverageData[$line]));
-
-                            $classLineElement = $document->createElement('line');
-                            $classLineElement->setAttribute('number', (string) $line);
-                            $classLineElement->setAttribute('hits', (string) count($coverageData[$line]));
-
-                            $classLinesElement->appendChild($classLineElement);
-                        }
-                    }
-
                     $linesValid   = $method['executableLines'];
                     $linesCovered = $method['executedLines'];
                     $lineRate     = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);
@@ -187,12 +172,22 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
 
                     $methodElement->appendChild($methodLinesElement);
 
-                    $methodLineElement = $document->createElement('line');
+                    foreach (range($method['startLine'], $method['endLine']) as $line) {
+                        if (!isset($coverageData[$line]) || $coverageData[$line] === null) {
+                            continue;
+                        }
+                        $methodLineElement = $document->createElement('line');
+
+                        $methodLineElement->setAttribute('number', (string) $line);
+                        $methodLineElement->setAttribute('hits', (string) count($coverageData[$line]));
 
-                    $methodLineElement->setAttribute('number', (string) $method['startLine']);
-                    $methodLineElement->setAttribute('hits', (string) $methodCount);
+                        $methodLinesElement->appendChild($methodLineElement);
+
+                        $classLineElement = $methodLineElement->cloneNode();
+
+                        $classLinesElement->appendChild($classLineElement);
+                    }
 
-                    $methodLinesElement->appendChild($methodLineElement);
                     $methodsElement->appendChild($methodElement);
                 }
             }

tests/_files/BankAccount-cobertura-line.xml

@@ -11,22 +11,28 @@
           <methods>
             <method name="getBalance" signature="getBalance()" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="6" hits="2"/>
+                <line number="8" hits="2"/>
               </lines>
             </method>
             <method name="setBalance" signature="setBalance($balance)" line-rate="0" branch-rate="0" complexity="2">
               <lines>
-                <line number="11" hits="0"/>
+                <line number="13" hits="0"/>
+                <line number="14" hits="0"/>
+                <line number="15" hits="0"/>
+                <line number="16" hits="0"/>
+                <line number="18" hits="0"/>
               </lines>
             </method>
             <method name="depositMoney" signature="depositMoney($balance)" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="20" hits="2"/>
+                <line number="22" hits="2"/>
+                <line number="24" hits="1"/>
               </lines>
             </method>
             <method name="withdrawMoney" signature="withdrawMoney($balance)" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="27" hits="2"/>
+                <line number="29" hits="2"/>
+                <line number="31" hits="1"/>
               </lines>
             </method>
           </methods>

tests/_files/BankAccount-cobertura-path.xml

@@ -11,22 +11,28 @@
           <methods>
             <method name="getBalance" signature="getBalance()" line-rate="1" branch-rate="1" complexity="1">
               <lines>
-                <line number="6" hits="2"/>
+                <line number="8" hits="2"/>
               </lines>
             </method>
             <method name="setBalance" signature="setBalance($balance)" line-rate="0" branch-rate="0" complexity="2">
               <lines>
-                <line number="11" hits="0"/>
+                <line number="13" hits="0"/>
+                <line number="14" hits="0"/>
+                <line number="15" hits="0"/>
+                <line number="16" hits="0"/>
+                <line number="18" hits="0"/>
               </lines>
             </method>
             <method name="depositMoney" signature="depositMoney($balance)" line-rate="1" branch-rate="1" complexity="1">
               <lines>
-                <line number="20" hits="2"/>
+                <line number="22" hits="2"/>
+                <line number="24" hits="1"/>
               </lines>
             </method>
             <method name="withdrawMoney" signature="withdrawMoney($balance)" line-rate="1" branch-rate="1" complexity="1">
               <lines>
-                <line number="27" hits="2"/>
+                <line number="29" hits="2"/>
+                <line number="31" hits="1"/>
               </lines>
             </method>
           </methods>

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

@@ -11,7 +11,15 @@
           <methods>
             <method name="runAnonymous" signature="runAnonymous()" line-rate="0.88888888888889" branch-rate="0" complexity="1">
               <lines>
-                <line number="5" hits="1"/>
+                <line number="7" hits="1"/>
+                <line number="9" hits="1"/>
+                <line number="10" hits="0"/>
+                <line number="11" hits="1"/>
+                <line number="12" hits="1"/>
+                <line number="13" hits="1"/>
+                <line number="14" hits="1"/>
+                <line number="17" hits="1"/>
+                <line number="18" hits="1"/>
               </lines>
             </method>
           </methods>