Skip to content

Commit 74c304e

Browse files
CJDennisCJDennis
committed
Put the columns in all reports in a consistent order for #827
- minor reformatting - split some files during one test to prevent a PCRE error
1 parent d96981c commit 74c304e

23 files changed

+1039
-814
lines changed

‎src/Report/Html/Renderer/Template/coverage_bar.html.dist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<div class="progress">
1+
2+
<div class="progress">
23
<div class="progress-bar bg-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
34
<span class="sr-only">{{percent}}% covered ({{level}})</span>
45
</div>
5-
</div>
6+
</div>
7+

‎src/Report/Html/Renderer/Template/coverage_bar_branch.html.dist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<div class="progress">
1+
2+
<div class="progress">
23
<div class="progress-bar bg-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
34
<span class="sr-only">{{percent}}% covered ({{level}})</span>
45
</div>
5-
</div>
6+
</div>
7+

‎src/Report/Html/Renderer/Template/file.html.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
</tr>
3434
<tr>
3535
<td>&nbsp;</td>
36-
<td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
37-
<td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
3836
<td colspan="3"><div align="center"><strong>Lines</strong></div></td>
37+
<td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
38+
<td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
3939
</tr>
4040
</thead>
4141
<tbody>

‎src/Report/Html/Renderer/Template/file_branch.html.dist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
</tr>
3434
<tr>
3535
<td>&nbsp;</td>
36-
<td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
37-
<td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
38-
<td colspan="3"><div align="center"><strong>Paths</strong></div></td>
39-
<td colspan="3"><div align="center"><strong>Branches</strong></div></td>
4036
<td colspan="3"><div align="center"><strong>Lines</strong></div></td>
37+
<td colspan="3"><div align="center"><strong>Branches</strong></div></td>
38+
<td colspan="3"><div align="center"><strong>Paths</strong></div></td>
39+
<td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
40+
<td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
4141
</tr>
4242
</thead>
4343
<tbody>

‎src/Report/Html/Renderer/Template/file_item.html.dist

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<tr>
2-
<td class="{{classes_level}}">{{name}}</td>
3-
<td class="{{classes_level}} big">{{classes_bar}}</td>
4-
<td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
5-
<td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
2+
<td class="{{lines_level}}">{{name}}</td>
3+
<td class="{{lines_level}} big">{{lines_bar}}</td>
4+
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
5+
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
66
<td class="{{methods_level}} big">{{methods_bar}}</td>
77
<td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
88
<td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
99
<td class="{{methods_level}} small">{{crap}}</td>
10-
<td class="{{lines_level}} big">{{lines_bar}}</td>
11-
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
12-
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
10+
<td class="{{classes_level}} big">{{classes_bar}}</td>
11+
<td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
12+
<td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
1313
</tr>
1414

‎src/Report/Html/Renderer/Template/file_item_branch.html.dist

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<tr>
2-
<td class="{{classes_level}}">{{name}}</td>
3-
<td class="{{classes_level}} big">{{classes_bar}}</td>
4-
<td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
5-
<td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
2+
<td class="{{lines_level}}">{{name}}</td>
3+
<td class="{{lines_level}} big">{{lines_bar}}</td>
4+
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
5+
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
6+
<td class="{{branches_level}} big">{{branches_bar}}</td>
7+
<td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
8+
<td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
9+
<td class="{{paths_level}} big">{{paths_bar}}</td>
10+
<td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
11+
<td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
612
<td class="{{methods_level}} big">{{methods_bar}}</td>
713
<td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
814
<td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
915
<td class="{{methods_level}} small">{{crap}}</td>
10-
<td class="{{paths_level}} big">{{paths_bar}}</td>
11-
<td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
12-
<td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
13-
<td class="{{branches_level}} big">{{branches_bar}}</td>
14-
<td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
15-
<td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
16-
<td class="{{lines_level}} big">{{lines_bar}}</td>
17-
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
18-
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
16+
<td class="{{classes_level}} big">{{classes_bar}}</td>
17+
<td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
18+
<td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
1919
</tr>
2020

‎src/Report/Html/Renderer/Template/method_item.html.dist

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<tr>
2-
<td class="{{methods_level}}" colspan="4">{{name}}</td>
2+
<td class="{{lines_level}}">{{name}}</td>
3+
<td class="{{lines_level}} big">{{lines_bar}}</td>
4+
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
5+
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
36
<td class="{{methods_level}} big">{{methods_bar}}</td>
47
<td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
58
<td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
69
<td class="{{methods_level}} small">{{crap}}</td>
7-
<td class="{{lines_level}} big">{{lines_bar}}</td>
8-
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
9-
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
10+
<td class="{{methods_level}}" colspan="3"></td>
1011
</tr>
1112

‎src/Report/Html/Renderer/Template/method_item_branch.html.dist

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<tr>
2-
<td class="{{methods_level}}" colspan="4">{{name}}</td>
2+
<td class="{{lines_level}}">{{name}}</td>
3+
<td class="{{lines_level}} big">{{lines_bar}}</td>
4+
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
5+
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
6+
<td class="{{branches_level}} big">{{branches_bar}}</td>
7+
<td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
8+
<td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
9+
<td class="{{paths_level}} big">{{paths_bar}}</td>
10+
<td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
11+
<td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
312
<td class="{{methods_level}} big">{{methods_bar}}</td>
413
<td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
514
<td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
615
<td class="{{methods_level}} small">{{crap}}</td>
7-
<td class="{{paths_level}} big">{{paths_bar}}</td>
8-
<td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
9-
<td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
10-
<td class="{{branches_level}} big">{{branches_bar}}</td>
11-
<td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
12-
<td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
13-
<td class="{{lines_level}} big">{{lines_bar}}</td>
14-
<td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
15-
<td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
16+
<td class="{{methods_level}}" colspan="3"></td>
1617
</tr>
1718

0 commit comments

Comments
 (0)