Don't include empty branches when rendering structure, e.g. {main}

Author: dvdoug

src/Report/Html/Renderer/File.php

@@ -650,10 +650,15 @@ private function renderBranchStructure(FileNode $node): string
                 continue;
             }
 
-            $branches .= '<h5 class="structure-heading"><a name="' . htmlspecialchars($methodName, $this->htmlSpecialCharsFlags) . '">' . $this->abbreviateMethodName($methodName) . '</a></h5>' . "\n";
+            $branchStructure = '';
 
             foreach ($methodData['branches'] as $branch) {
-                $branches .= $this->renderBranchLines($branch, $codeLines, $testData);
+                $branchStructure .= $this->renderBranchLines($branch, $codeLines, $testData);
+            }
+
+            if ($branchStructure !== '') { // don't show empty branches
+                $branches .= '<h5 class="structure-heading"><a name="' . htmlspecialchars($methodName, $this->htmlSpecialCharsFlags) . '">' . $this->abbreviateMethodName($methodName) . '</a></h5>' . "\n";
+                $branches .= $branchStructure;
             }
         }
 
@@ -720,6 +725,10 @@ private function renderBranchLines(array $branch, array $codeLines, array $testD
             $lines .= $this->renderLine($singleLineTemplate, $line, $codeLines[$line - 1], $trClass, $popover);
         }
 
+        if ($lines === '') {
+            return '';
+        }
+
         $linesTemplate->setVar(['lines' => $lines]);
 
         return $linesTemplate->render();
@@ -741,16 +750,21 @@ private function renderPathStructure(FileNode $node): string
                 continue;
             }
 
-            $paths .= '<h5 class="structure-heading"><a name="' . htmlspecialchars($methodName, $this->htmlSpecialCharsFlags) . '">' . $this->abbreviateMethodName($methodName) . '</a></h5>' . "\n";
+            $pathStructure = '';
 
             if (count($methodData['paths']) > 100) {
-                $paths .= '<p>' . count($methodData['paths']) . ' is too many paths to sensibly render, consider refactoring your code to bring this number down.</p>';
+                $pathStructure .= '<p>' . count($methodData['paths']) . ' is too many paths to sensibly render, consider refactoring your code to bring this number down.</p>';
 
                 continue;
             }
 
             foreach ($methodData['paths'] as $path) {
-                $paths .= $this->renderPathLines($path, $methodData['branches'], $codeLines, $testData);
+                $pathStructure .= $this->renderPathLines($path, $methodData['branches'], $codeLines, $testData);
+            }
+
+            if ($pathStructure !== '') {
+                $paths .= '<h5 class="structure-heading"><a name="' . htmlspecialchars($methodName, $this->htmlSpecialCharsFlags) . '">' . $this->abbreviateMethodName($methodName) . '</a></h5>' . "\n";
+                $paths .= $pathStructure;
             }
         }
 
@@ -819,6 +833,10 @@ private function renderPathLines(array $path, array $branches, array $codeLines,
             }
         }
 
+        if ($lines === '') {
+            return '';
+        }
+
         $linesTemplate->setVar(['lines' => $lines]);
 
         return $linesTemplate->render();

tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_branch.html

@@ -391,12 +391,6 @@ <h5 class="structure-heading"><a name="BankAccount-&gt;withdrawMoney">BankAccoun
     <tr class="%s"><td  data-title="%s" data-content="&lt;ul&gt;&lt;li&gt;%sCannotBecomeNegative&lt;/li&gt;&lt;li&gt;%sDepositWithdrawMoney&lt;/li&gt;" data-placement="top" data-html="true" class="col-1 text-right"><a id="31" href="#31">31</a></td><td class="codeLine">%s</td></tr>
     <tr class="covered-by-large-tests popin"><td  data-title="%s" data-content="&lt;ul&gt;&lt;li&gt;%sCannotBecomeNegative&lt;/li&gt;&lt;li&gt;%sDepositWithdrawMoney&lt;/li&gt;" data-placement="top" data-html="true" class="col-1 text-right"><a id="32" href="#32">32</a></td><td class="codeLine">%s</td></tr>
 
-</tbody>
-</table>
-<h5 class="structure-heading"><a name="{main}">{main}</a></h5>
-<table id="code" class="table table-borderless table-condensed">
-<tbody>
-
 </tbody>
 </table>
 

tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_path.html

@@ -384,12 +384,6 @@ <h5 class="structure-heading"><a name="BankAccount-&gt;withdrawMoney">BankAccoun
     <tr class="%s"><td  data-title="%s" data-content="&lt;ul&gt;&lt;li&gt;%sCannotBecomeNegative&lt;/li&gt;&lt;li&gt;%sDepositWithdrawMoney&lt;/li&gt;" data-placement="top" data-html="true" class="col-1 text-right"><a id="31" href="#31">31</a></td><td class="codeLine">%s</td></tr>
     <tr class="%s"><td  data-title="2 tests cover this path" data-content="&lt;ul&gt;&lt;li&gt;%sCannotBecomeNegative&lt;/li&gt;&lt;li&gt;%sDepositWithdrawMoney&lt;/li&gt;" data-placement="top" data-html="true" class="col-1 text-right"><a id="32" href="#32">32</a></td><td class="codeLine">%s</td></tr>
 
-</tbody>
-</table>
-<h5 class="structure-heading"><a name="{main}">{main}</a></h5>
-<table id="code" class="table table-borderless table-condensed">
-<tbody>
-
 </tbody>
 </table>