From 8a569558dcc64b65672b2177bbccebc899755ff9 Mon Sep 17 00:00:00 2001
From: Dan Hemberger <daniel.hemberger@gmail.com>
Date: Mon, 21 Feb 2022 02:34:16 -0800
Subject: [PATCH 1/2] Synchronize column ordering between Html\Renderers

Fixes #827.

The column ordering was reversed in the File renderer compared to the
Directory renderer. This made it a bit confusing when jumping between
directory and file reports.

The File renderer now uses the same column ordering as the Directory
renderer.
---
 .../Html/Renderer/Template/file.html.dist     |   4 +-
 .../Renderer/Template/file_branch.html.dist   |   8 +-
 .../Renderer/Template/file_item.html.dist     |  12 +-
 .../Template/file_item_branch.html.dist       |  24 ++--
 .../Renderer/Template/method_item.html.dist   |   9 +-
 .../Template/method_item_branch.html.dist     |  21 +--
 .../BankAccount.php.html                      |  76 ++++++-----
 .../source_with_ignore.php.html               |  27 ++--
 ...with_class_and_anonymous_function.php.html |  21 +--
 .../source_without_namespace.php.html         |  39 +++---
 .../source_without_namespace.php_branch.html  |  39 +++---
 .../source_without_namespace.php_path.html    |  39 +++---
 ...with_class_and_anonymous_function.php.html |  21 +--
 .../source_without_namespace.php.html         |  39 +++---
 .../source_without_namespace.php_branch.html  |  39 +++---
 .../source_without_namespace.php_path.html    |  39 +++---
 .../BankAccount.php.html                      | 128 +++++++++---------
 .../BankAccount.php_branch.html               | 128 +++++++++---------
 .../BankAccount.php_path.html                 | 128 +++++++++---------
 19 files changed, 435 insertions(+), 406 deletions(-)

diff --git a/src/Report/Html/Renderer/Template/file.html.dist b/src/Report/Html/Renderer/Template/file.html.dist
index 686b8b946..af8631d13 100644
--- a/src/Report/Html/Renderer/Template/file.html.dist
+++ b/src/Report/Html/Renderer/Template/file.html.dist
@@ -33,9 +33,9 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
diff --git a/src/Report/Html/Renderer/Template/file_branch.html.dist b/src/Report/Html/Renderer/Template/file_branch.html.dist
index ecbe62134..8717d7f9a 100644
--- a/src/Report/Html/Renderer/Template/file_branch.html.dist
+++ b/src/Report/Html/Renderer/Template/file_branch.html.dist
@@ -33,11 +33,11 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
diff --git a/src/Report/Html/Renderer/Template/file_item.html.dist b/src/Report/Html/Renderer/Template/file_item.html.dist
index dc754b3c6..335f0ccc6 100644
--- a/src/Report/Html/Renderer/Template/file_item.html.dist
+++ b/src/Report/Html/Renderer/Template/file_item.html.dist
@@ -1,14 +1,14 @@
       <tr>
        <td class="{{classes_level}}">{{name}}</td>
-       <td class="{{classes_level}} big">{{classes_bar}}</td>
-       <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
-       <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
        <td class="{{methods_level}} big">{{methods_bar}}</td>
        <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
        <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
        <td class="{{methods_level}} small">{{crap}}</td>
-       <td class="{{lines_level}} big">{{lines_bar}}</td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{classes_level}} big">{{classes_bar}}</td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
       </tr>
 
diff --git a/src/Report/Html/Renderer/Template/file_item_branch.html.dist b/src/Report/Html/Renderer/Template/file_item_branch.html.dist
index d7e479f62..90e25eaac 100644
--- a/src/Report/Html/Renderer/Template/file_item_branch.html.dist
+++ b/src/Report/Html/Renderer/Template/file_item_branch.html.dist
@@ -1,20 +1,20 @@
       <tr>
        <td class="{{classes_level}}">{{name}}</td>
-       <td class="{{classes_level}} big">{{classes_bar}}</td>
-       <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
-       <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{branches_level}} big">{{branches_bar}}</td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
+       <td class="{{paths_level}} big">{{paths_bar}}</td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
        <td class="{{methods_level}} big">{{methods_bar}}</td>
        <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
        <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
        <td class="{{methods_level}} small">{{crap}}</td>
-       <td class="{{paths_level}} big">{{paths_bar}}</td>
-       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
-       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
-       <td class="{{branches_level}} big">{{branches_bar}}</td>
-       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
-       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
-       <td class="{{lines_level}} big">{{lines_bar}}</td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{classes_level}} big">{{classes_bar}}</td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
       </tr>
 
diff --git a/src/Report/Html/Renderer/Template/method_item.html.dist b/src/Report/Html/Renderer/Template/method_item.html.dist
index d8890ed27..c117adc44 100644
--- a/src/Report/Html/Renderer/Template/method_item.html.dist
+++ b/src/Report/Html/Renderer/Template/method_item.html.dist
@@ -1,11 +1,12 @@
       <tr>
-       <td class="{{methods_level}}" colspan="4">{{name}}</td>
+       <td class="{{methods_level}}">{{name}}</td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
        <td class="{{methods_level}} big">{{methods_bar}}</td>
        <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
        <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
        <td class="{{methods_level}} small">{{crap}}</td>
-       <td class="{{lines_level}} big">{{lines_bar}}</td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{methods_level}}" colspan="3"></td>
       </tr>
 
diff --git a/src/Report/Html/Renderer/Template/method_item_branch.html.dist b/src/Report/Html/Renderer/Template/method_item_branch.html.dist
index a6a25f95e..e8cbe0684 100644
--- a/src/Report/Html/Renderer/Template/method_item_branch.html.dist
+++ b/src/Report/Html/Renderer/Template/method_item_branch.html.dist
@@ -1,17 +1,18 @@
       <tr>
-       <td class="{{methods_level}}" colspan="4">{{name}}</td>
+       <td class="{{methods_level}}">{{name}}</td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{branches_level}} big">{{branches_bar}}</td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
+       <td class="{{paths_level}} big">{{paths_bar}}</td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
        <td class="{{methods_level}} big">{{methods_bar}}</td>
        <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
        <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
        <td class="{{methods_level}} small">{{crap}}</td>
-       <td class="{{paths_level}} big">{{paths_bar}}</td>
-       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
-       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
-       <td class="{{branches_level}} big">{{branches_bar}}</td>
-       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
-       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
-       <td class="{{lines_level}} big">{{lines_bar}}</td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{methods_level}}" colspan="3"></td>
       </tr>
 
diff --git a/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html b/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html
index 05078012d..dec35d424 100644
--- a/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html
+++ b/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html
@@ -35,22 +35,22 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="danger">Total</td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
-           <span class="sr-only">0.00% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="warning small"><div align="right">55.56%</div></td>
+       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
            <span class="sr-only">75.00% covered (warning)</span>
@@ -60,26 +60,26 @@
        <td class="warning small"><div align="right">75.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
        <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">55.56%</div></td>
-       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger small"><div align="right">0.00%</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
        <td class="danger">BankAccount</td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
-           <span class="sr-only">0.00% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="warning small"><div align="right">55.56%</div></td>
+       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
            <span class="sr-only">75.00% covered (warning)</span>
@@ -89,18 +89,18 @@
        <td class="warning small"><div align="right">75.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
        <td class="warning small">7.19</td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">55.56%</div></td>
-       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger small"><div align="right">0.00%</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
+       <td class="success">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -109,7 +109,6 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -118,10 +117,12 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
+       <td class="danger">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -129,8 +130,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -138,11 +138,13 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -150,8 +152,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -159,11 +160,13 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -171,8 +174,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -180,7 +182,9 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
 
diff --git a/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html b/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html
index 58f568164..582f8d694 100644
--- a/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html
+++ b/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html
@@ -35,17 +35,14 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -54,7 +51,6 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -63,17 +59,22 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="" colspan="4"><a href="#28"><abbr title="baz()">baz</abbr></a></td>
+       <td class=""><a href="#28"><abbr title="baz()">baz</abbr></a></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">1</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">1</td>
+       <td class="" colspan="3"></td>
       </tr>
 
       <tr>
@@ -91,14 +92,15 @@
       </tr>
 
       <tr>
-       <td class="" colspan="4">&nbsp;<a href="#13"><abbr title="bar()">bar</abbr></a></td>
+       <td class="">&nbsp;<a href="#13"><abbr title="bar()">bar</abbr></a></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">1</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">1</td>
+       <td class="" colspan="3"></td>
       </tr>
 
       <tr>
@@ -116,14 +118,15 @@
       </tr>
 
       <tr>
-       <td class="" colspan="4">&nbsp;<a href="#23"><abbr title="foo()">foo</abbr></a></td>
+       <td class="">&nbsp;<a href="#23"><abbr title="foo()">foo</abbr></a></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">1</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">1</td>
+       <td class="" colspan="3"></td>
       </tr>
 
 
diff --git a/tests/_files/Report/HTML/PHP80AndBelow/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html b/tests/_files/Report/HTML/PHP80AndBelow/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
index df5d7c6e5..3edaf9194 100644
--- a/tests/_files/Report/HTML/PHP80AndBelow/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
+++ b/tests/_files/Report/HTML/PHP80AndBelow/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
@@ -35,9 +35,9 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
@@ -50,7 +50,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -67,7 +67,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
@@ -79,7 +79,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -96,11 +96,11 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#5"><abbr title="runAnonymous()">runAnonymous</abbr></a></td>
+       <td class="success">&nbsp;<a href="#5"><abbr title="runAnonymous()">runAnonymous</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -108,8 +108,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
 
diff --git a/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html b/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html
index d82da91c5..80d5208c9 100644
--- a/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html
+++ b/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html
@@ -35,19 +35,16 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -55,8 +52,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -64,7 +60,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -72,7 +68,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -80,11 +76,15 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
+       <td class="danger"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -92,8 +92,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -101,7 +100,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -109,7 +108,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
@@ -128,13 +129,13 @@
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
diff --git a/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html b/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html
index a95fbb002..08cb2f8d4 100644
--- a/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html
+++ b/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html
@@ -35,19 +35,16 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -55,8 +52,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -64,7 +60,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -72,7 +68,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -80,11 +76,15 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
+       <td class="danger"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -92,8 +92,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -101,7 +100,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -109,7 +108,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
@@ -128,13 +129,13 @@
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
diff --git a/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html b/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html
index c54d785b3..865d91862 100644
--- a/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html
+++ b/tests/_files/Report/HTML/PHP80AndBelow/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html
@@ -35,19 +35,16 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -55,8 +52,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -64,7 +60,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -72,7 +68,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -80,11 +76,15 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
+       <td class="danger"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -92,8 +92,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -101,7 +100,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -109,7 +108,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
@@ -128,13 +129,13 @@
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
diff --git a/tests/_files/Report/HTML/PHP81AndUp/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html b/tests/_files/Report/HTML/PHP81AndUp/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
index 3bddd888f..a3fe6539d 100644
--- a/tests/_files/Report/HTML/PHP81AndUp/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
+++ b/tests/_files/Report/HTML/PHP81AndUp/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
@@ -35,9 +35,9 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
@@ -50,7 +50,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -67,7 +67,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
@@ -79,7 +79,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -96,11 +96,11 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#5"><abbr title="runAnonymous()">runAnonymous</abbr></a></td>
+       <td class="success">&nbsp;<a href="#5"><abbr title="runAnonymous()">runAnonymous</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -108,8 +108,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">5&nbsp;/&nbsp;5</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
 
diff --git a/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html b/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html
index aee66088a..bb36492ce 100644
--- a/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html
+++ b/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php.html
@@ -35,19 +35,16 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -55,8 +52,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -64,7 +60,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -72,7 +68,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -80,11 +76,15 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
+       <td class="danger"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -92,8 +92,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -101,7 +100,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -109,7 +108,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
@@ -128,13 +129,13 @@
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
diff --git a/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html b/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html
index 8368e45c0..555cd4b26 100644
--- a/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html
+++ b/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_branch.html
@@ -35,19 +35,16 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -55,8 +52,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -64,7 +60,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -72,7 +68,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -80,11 +76,15 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
+       <td class="danger"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -92,8 +92,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -101,7 +100,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -109,7 +108,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
@@ -128,13 +129,13 @@
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
diff --git a/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html b/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html
index 543f5109d..44dbdb6fe 100644
--- a/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html
+++ b/tests/_files/Report/HTML/PHP81AndUp/PathCoverageForSourceWithoutNamespace/source_without_namespace.php_path.html
@@ -35,19 +35,16 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="">Total</td>
-       <td class=" big"></td>
-       <td class=" small"><div align="right">n/a</div></td>
-       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -55,8 +52,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -64,7 +60,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -72,7 +68,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -80,11 +76,15 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class=" big"></td>
+       <td class=" small"><div align="right">n/a</div></td>
+       <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
+       <td class="danger"><a href="#12"><abbr title="&amp;foo($bar)">foo</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -92,8 +92,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -101,7 +100,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -109,7 +108,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -117,7 +116,9 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
@@ -128,13 +129,13 @@
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
-       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+       <td class=" small">0</td>
        <td class=" big"></td>
        <td class=" small"><div align="right">n/a</div></td>
        <td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
diff --git a/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php.html b/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php.html
index 60f633a9b..eef1ced72 100644
--- a/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php.html
+++ b/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php.html
@@ -35,33 +35,32 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="danger">Total</td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
-           <span class="sr-only">0.00% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
-           <span class="sr-only">75.00% covered (warning)</span>
+       <td class="warning small"><div align="right">55.56%</div></td>
+       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
+           <span class="sr-only">42.86% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">75.00%</div></td>
-       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">42.86%</div></td>
+       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>
@@ -70,26 +69,15 @@
 </td>
        <td class="warning small"><div align="right">60.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;5</div></td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
-         </div>
-       </div>
-</td>
-       <td class="danger small"><div align="right">42.86%</div></td>
-       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
+           <span class="sr-only">75.00% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">55.56%</div></td>
-       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
-      </tr>
-
-      <tr>
-       <td class="danger">BankAccount</td>
+       <td class="warning small"><div align="right">75.00%</div></td>
+       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
+       <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -98,15 +86,26 @@
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
        <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      </tr>
+
+      <tr>
+       <td class="danger">BankAccount</td>
        <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
-           <span class="sr-only">75.00% covered (warning)</span>
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">75.00%</div></td>
-       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small">6.60</td>
+       <td class="warning small"><div align="right">55.56%</div></td>
+       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
+           <span class="sr-only">42.86% covered (danger)</span>
+         </div>
+       </div>
+</td>
+       <td class="danger small"><div align="right">42.86%</div></td>
+       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>
@@ -115,26 +114,27 @@
 </td>
        <td class="warning small"><div align="right">60.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;5</div></td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
+           <span class="sr-only">75.00% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div align="right">42.86%</div></td>
-       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+       <td class="warning small"><div align="right">75.00%</div></td>
+       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
+       <td class="warning small">6.60</td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">55.56%</div></td>
-       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger small"><div align="right">0.00%</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
+       <td class="success">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -143,7 +143,6 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -168,10 +167,12 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
+       <td class="danger">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -179,8 +180,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -188,7 +188,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -196,7 +196,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -204,11 +204,13 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -216,8 +218,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -241,11 +242,13 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -253,8 +256,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -278,7 +280,9 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
 
diff --git a/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_branch.html b/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_branch.html
index 11336c19e..d1578356a 100644
--- a/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_branch.html
+++ b/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_branch.html
@@ -35,33 +35,32 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="danger">Total</td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
-           <span class="sr-only">0.00% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
-           <span class="sr-only">75.00% covered (warning)</span>
+       <td class="warning small"><div align="right">55.56%</div></td>
+       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
+           <span class="sr-only">42.86% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">75.00%</div></td>
-       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div align="right">42.86%</div></td>
+       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>
@@ -70,26 +69,15 @@
 </td>
        <td class="warning small"><div align="right">60.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;5</div></td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
-         </div>
-       </div>
-</td>
-       <td class="danger small"><div align="right">42.86%</div></td>
-       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
+           <span class="sr-only">75.00% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">55.56%</div></td>
-       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
-      </tr>
-
-      <tr>
-       <td class="danger">BankAccount</td>
+       <td class="warning small"><div align="right">75.00%</div></td>
+       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
+       <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -98,15 +86,26 @@
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
        <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      </tr>
+
+      <tr>
+       <td class="danger">BankAccount</td>
        <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
-           <span class="sr-only">75.00% covered (warning)</span>
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">75.00%</div></td>
-       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small">6.60</td>
+       <td class="warning small"><div align="right">55.56%</div></td>
+       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
+           <span class="sr-only">42.86% covered (danger)</span>
+         </div>
+       </div>
+</td>
+       <td class="danger small"><div align="right">42.86%</div></td>
+       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>
@@ -115,26 +114,27 @@
 </td>
        <td class="warning small"><div align="right">60.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;5</div></td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
+           <span class="sr-only">75.00% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div align="right">42.86%</div></td>
-       <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+       <td class="warning small"><div align="right">75.00%</div></td>
+       <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
+       <td class="warning small">6.60</td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div align="right">55.56%</div></td>
-       <td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
+       <td class="danger small"><div align="right">0.00%</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
+       <td class="success">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -143,7 +143,6 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -168,10 +167,12 @@
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
        <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
+       <td class="danger">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -179,8 +180,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -188,7 +188,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -196,7 +196,7 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -204,11 +204,13 @@
        </div>
 </td>
        <td class="danger small"><div align="right">0.00%</div></td>
-       <td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -216,8 +218,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -241,11 +242,13 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -253,8 +256,7 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -278,7 +280,9 @@
        </div>
 </td>
        <td class="success small"><div align="right">100.00%</div></td>
-       <td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
 
diff --git a/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_path.html b/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_path.html
index 681005e0e..e2de7f125 100644
--- a/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_path.html
+++ b/tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php_path.html
@@ -35,33 +35,32 @@
       </tr>
       <tr>
        <td>&nbsp;</td>
-       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
-       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
        <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
       </tr>
      </thead>
      <tbody>
       <tr>
        <td class="danger">Total</td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
-           <span class="sr-only">0.00% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div %s>0.00%</div></td>
-       <td class="danger small"><div %s>0&nbsp;/&nbsp;1</div></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
-           <span class="sr-only">75.00% covered (warning)</span>
+       <td class="warning small"><div %s>55.56%</div></td>
+       <td class="warning small"><div %s>5&nbsp;/&nbsp;9</div></td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
+           <span class="sr-only">42.86% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div %s>75.00%</div></td>
-       <td class="warning small"><div %s>3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
+       <td class="danger small"><div %s>42.86%</div></td>
+       <td class="danger small"><div %s>3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>
@@ -70,26 +69,15 @@
 </td>
        <td class="warning small"><div %s>60.00%</div></td>
        <td class="warning small"><div %s>3&nbsp;/&nbsp;5</div></td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
-         </div>
-       </div>
-</td>
-       <td class="danger small"><div %s>42.86%</div></td>
-       <td class="danger small"><div %s>3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
+           <span class="sr-only">75.00% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div %s>55.56%</div></td>
-       <td class="warning small"><div %s>5&nbsp;/&nbsp;9</div></td>
-      </tr>
-
-      <tr>
-       <td class="danger">BankAccount</td>
+       <td class="warning small"><div %s>75.00%</div></td>
+       <td class="warning small"><div %s>3&nbsp;/&nbsp;4</div></td>
+       <td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -98,15 +86,26 @@
 </td>
        <td class="danger small"><div %s>0.00%</div></td>
        <td class="danger small"><div %s>0&nbsp;/&nbsp;1</div></td>
+      </tr>
+
+      <tr>
+       <td class="danger">BankAccount</td>
        <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
-           <span class="sr-only">75.00% covered (warning)</span>
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
+           <span class="sr-only">55.56% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div %s>75.00%</div></td>
-       <td class="warning small"><div %s>3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small">6.60</td>
+       <td class="warning small"><div %s>55.56%</div></td>
+       <td class="warning small"><div %s>5&nbsp;/&nbsp;9</div></td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
+           <span class="sr-only">42.86% covered (danger)</span>
+         </div>
+       </div>
+</td>
+       <td class="danger small"><div %s>42.86%</div></td>
+       <td class="danger small"><div %s>3&nbsp;/&nbsp;7</div></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>
@@ -115,26 +114,27 @@
 </td>
        <td class="warning small"><div %s>60.00%</div></td>
        <td class="warning small"><div %s>3&nbsp;/&nbsp;5</div></td>
-       <td class="danger big">       <div class="progress">
-         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
+       <td class="warning big">       <div class="progress">
+         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
+           <span class="sr-only">75.00% covered (warning)</span>
          </div>
        </div>
 </td>
-       <td class="danger small"><div %s>42.86%</div></td>
-       <td class="danger small"><div %s>3&nbsp;/&nbsp;7</div></td>
-       <td class="warning big">       <div class="progress">
-         <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
-           <span class="sr-only">55.56% covered (warning)</span>
+       <td class="warning small"><div %s>75.00%</div></td>
+       <td class="warning small"><div %s>3&nbsp;/&nbsp;4</div></td>
+       <td class="warning small">6.60</td>
+       <td class="danger big">       <div class="progress">
+         <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
          </div>
        </div>
 </td>
-       <td class="warning small"><div %s>55.56%</div></td>
-       <td class="warning small"><div %s>5&nbsp;/&nbsp;9</div></td>
+       <td class="danger small"><div %s>0.00%</div></td>
+       <td class="danger small"><div %s>0&nbsp;/&nbsp;1</div></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
+       <td class="success">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" %s style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -143,7 +143,6 @@
 </td>
        <td class="success small"><div %s>100.00%</div></td>
        <td class="success small"><div %s>1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" %s style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -168,10 +167,12 @@
 </td>
        <td class="success small"><div %s>100.00%</div></td>
        <td class="success small"><div %s>1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="danger" colspan="4">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
+       <td class="danger">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -179,8 +180,7 @@
        </div>
 </td>
        <td class="danger small"><div %s>0.00%</div></td>
-       <td class="danger small"><div %s>0&nbsp;/&nbsp;1</div></td>
-       <td class="danger small">6</td>
+       <td class="danger small"><div %s>0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -188,7 +188,7 @@
        </div>
 </td>
        <td class="danger small"><div %s>0.00%</div></td>
-       <td class="danger small"><div %s>0&nbsp;/&nbsp;2</div></td>
+       <td class="danger small"><div %s>0&nbsp;/&nbsp;4</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -196,7 +196,7 @@
        </div>
 </td>
        <td class="danger small"><div %s>0.00%</div></td>
-       <td class="danger small"><div %s>0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div %s>0&nbsp;/&nbsp;2</div></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -204,11 +204,13 @@
        </div>
 </td>
        <td class="danger small"><div %s>0.00%</div></td>
-       <td class="danger small"><div %s>0&nbsp;/&nbsp;4</div></td>
+       <td class="danger small"><div %s>0&nbsp;/&nbsp;1</div></td>
+       <td class="danger small">6</td>
+       <td class="danger" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" %s style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -216,8 +218,7 @@
        </div>
 </td>
        <td class="success small"><div %s>100.00%</div></td>
-       <td class="success small"><div %s>1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div %s>2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" %s style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -241,11 +242,13 @@
        </div>
 </td>
        <td class="success small"><div %s>100.00%</div></td>
-       <td class="success small"><div %s>2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div %s>1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
       <tr>
-       <td class="success" colspan="4">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
+       <td class="success">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" %s style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -253,8 +256,7 @@
        </div>
 </td>
        <td class="success small"><div %s>100.00%</div></td>
-       <td class="success small"><div %s>1&nbsp;/&nbsp;1</div></td>
-       <td class="success small">1</td>
+       <td class="success small"><div %s>2&nbsp;/&nbsp;2</div></td>
        <td class="success big">       <div class="progress">
          <div class="progress-bar bg-success" role="progressbar" %s style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>
@@ -278,7 +280,9 @@
        </div>
 </td>
        <td class="success small"><div %s>100.00%</div></td>
-       <td class="success small"><div %s>2&nbsp;/&nbsp;2</div></td>
+       <td class="success small"><div %s>1&nbsp;/&nbsp;1</div></td>
+       <td class="success small">1</td>
+       <td class="success" colspan="3"></td>
       </tr>
 
 

From 75a0f913c9d4dfc84d3ee0ab83faffdcc9779646 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Mon, 21 Feb 2022 13:32:08 +0100
Subject: [PATCH 2/2] Fix WS issue

---
 src/StaticAnalysis/CachingFileAnalyser.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/StaticAnalysis/CachingFileAnalyser.php b/src/StaticAnalysis/CachingFileAnalyser.php
index 5a3986a00..7ca794310 100644
--- a/src/StaticAnalysis/CachingFileAnalyser.php
+++ b/src/StaticAnalysis/CachingFileAnalyser.php
@@ -137,9 +137,7 @@ private function read(string $filename)
         }
 
         return unserialize(
-            file_get_contents(
-                $cacheFile
-            ),
+            file_get_contents($cacheFile),
             ['allowed_classes' => false]
         );
     }