More experimentation with how branch and path coverage is presented

Author: sebastianbergmann

src/Report/Html/Renderer/File.php

@@ -636,7 +636,8 @@ private function renderSourceWithBranchCoverage(FileNode $node): string
         $testData             = $node->testData();
         $codeLines            = $this->loadFile($node->pathAsString());
 
-        $lineData = [];
+        $lineData        = [];
+        $branchStartData = [];
 
         foreach (array_keys($codeLines) as $line) {
             $lineData[$line + 1] = [
@@ -650,6 +651,20 @@ private function renderSourceWithBranchCoverage(FileNode $node): string
         foreach ($functionCoverageData as $method) {
             /** @var ProcessedBranchCoverageData $branch */
             foreach ($method->branches as $branch) {
+                $startLine = min($branch->line_start, $branch->line_end);
+
+                if (isset($lineData[$startLine])) {
+                    if (!isset($branchStartData[$startLine])) {
+                        $branchStartData[$startLine] = ['total' => 0, 'hit' => 0];
+                    }
+
+                    $branchStartData[$startLine]['total']++;
+
+                    if ($branch->hit !== []) {
+                        $branchStartData[$startLine]['hit']++;
+                    }
+                }
+
                 foreach (range($branch->line_start, $branch->line_end) as $line) {
                     if (!isset($lineData[$line])) { // blank line at end of file is sometimes included here
                         continue;
@@ -673,6 +688,9 @@ private function renderSourceWithBranchCoverage(FileNode $node): string
             $trClass = '';
             $popover = '';
 
+            $coverageCount      = '';
+            $coverageCountClass = 'coverage-count';
+
             if ($lineData[$i]['includedInBranches'] > 0) {
                 $lineCss = 'success';
 
@@ -682,6 +700,10 @@ private function renderSourceWithBranchCoverage(FileNode $node): string
                     $lineCss = 'warning';
                 }
 
+                if (isset($branchStartData[$i]) && $branchStartData[$i]['total'] > 1) {
+                    $coverageCount = $branchStartData[$i]['hit'] . '/' . $branchStartData[$i]['total'];
+                }
+
                 $popoverContent = '<ul>';
 
                 if (count($lineData[$i]['tests']) === 1) {
@@ -705,7 +727,7 @@ private function renderSourceWithBranchCoverage(FileNode $node): string
                 );
             }
 
-            $lines .= $this->renderLine($singleLineTemplate, $i, $line, $trClass, $popover);
+            $lines .= $this->renderLine($singleLineTemplate, $i, $line, $trClass, $popover, $coverageCount, $coverageCountClass);
 
             $i++;
         }
@@ -761,6 +783,8 @@ private function renderSourceWithPathCoverage(FileNode $node): string
         foreach ($codeLines as $line) {
             $trClass                 = '';
             $popover                 = '';
+            $coverageCount           = '';
+            $coverageCountClass      = 'coverage-count';
             $includedInPathsCount    = count(array_unique($lineData[$i]['includedInPaths']));
             $includedInHitPathsCount = count(array_unique($lineData[$i]['includedInHitPaths']));
 
@@ -796,7 +820,7 @@ private function renderSourceWithPathCoverage(FileNode $node): string
                 );
             }
 
-            $lines .= $this->renderLine($singleLineTemplate, $i, $line, $trClass, $popover);
+            $lines .= $this->renderLine($singleLineTemplate, $i, $line, $trClass, $popover, $coverageCount, $coverageCountClass);
 
             $i++;
         }
@@ -971,14 +995,16 @@ private function renderPathStructure(FileNode $node): string
         return $pathsTemplate->render();
     }
 
-    private function renderLine(Template $template, int $lineNumber, string $lineContent, string $class, string $popover): string
+    private function renderLine(Template $template, int $lineNumber, string $lineContent, string $class, string $popover, string $coverageCount = '', string $coverageCountClass = 'col-0'): string
     {
         $template->setVar(
             [
-                'lineNumber'  => (string) $lineNumber,
-                'lineContent' => $lineContent,
-                'class'       => $class,
-                'popover'     => $popover,
+                'lineNumber'         => (string) $lineNumber,
+                'lineContent'        => $lineContent,
+                'class'              => $class,
+                'popover'            => $popover,
+                'coverageCount'      => $coverageCount,
+                'coverageCountClass' => $coverageCountClass,
             ],
         );
 

src/Report/Html/Renderer/Template/css/style.css

@@ -171,6 +171,20 @@ td.codeLine {
  white-space: pre-wrap;
 }
 
+td.coverage-count {
+ font-family: var(--bs-font-monospace);
+ font-size: 0.75em;
+ text-align: center;
+ vertical-align: middle;
+ white-space: nowrap;
+ width: 3.5em;
+ flex: 0 0 3.5em;
+}
+
+td.col-0 {
+ display: none;
+}
+
 td span.comment {
  color: var(--bs-secondary-color);
 }

src/Report/Html/Renderer/Template/line.html.dist

@@ -1 +1 @@
-    <tr class="{{class}} d-flex"><td {{popover}} class="col-1 text-end"><a id="{{lineNumber}}" href="#{{lineNumber}}">{{lineNumber}}</a></td><td class="col-11 codeLine">{{lineContent}}</td></tr>
+    <tr class="{{class}} d-flex"><td {{popover}} class="col-1 text-end"><a id="{{lineNumber}}" href="#{{lineNumber}}">{{lineNumber}}</a></td><td class="{{coverageCountClass}}">{{coverageCount}}</td><td class="col codeLine">{{lineContent}}</td></tr>