Skip to content

Commit 8a56955

Browse files
hembergersebastianbergmann
hemberger
authored and
sebastianbergmann
committed
Synchronize column ordering between Html\Renderers
Fixes sebastianbergmann#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.
1 parent 31ae9e7 commit 8a56955

File tree

19 files changed

+435
-406
lines changed

19 files changed

+435
-406
lines changed

‎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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<tr>
22
<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>
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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<tr>
22
<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>
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="{{methods_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="{{methods_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

‎tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@
3535
</tr>
3636
<tr>
3737
<td>&nbsp;</td>
38-
<td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
39-
<td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
4038
<td colspan="3"><div align="center"><strong>Lines</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>
4444
<tr>
4545
<td class="danger">Total</td>
46-
<td class="danger big"> <div class="progress">
47-
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
48-
<span class="sr-only">0.00% covered (danger)</span>
46+
<td class="warning big"> <div class="progress">
47+
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
48+
<span class="sr-only">55.56% covered (warning)</span>
4949
</div>
5050
</div>
5151
</td>
52-
<td class="danger small"><div align="right">0.00%</div></td>
53-
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
52+
<td class="warning small"><div align="right">55.56%</div></td>
53+
<td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
5454
<td class="warning big"> <div class="progress">
5555
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
5656
<span class="sr-only">75.00% covered (warning)</span>
@@ -60,26 +60,26 @@
6060
<td class="warning small"><div align="right">75.00%</div></td>
6161
<td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
6262
<td class="warning small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
63-
<td class="warning big"> <div class="progress">
64-
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
65-
<span class="sr-only">55.56% covered (warning)</span>
63+
<td class="danger big"> <div class="progress">
64+
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
65+
<span class="sr-only">0.00% covered (danger)</span>
6666
</div>
6767
</div>
6868
</td>
69-
<td class="warning small"><div align="right">55.56%</div></td>
70-
<td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
69+
<td class="danger small"><div align="right">0.00%</div></td>
70+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
7171
</tr>
7272

7373
<tr>
7474
<td class="danger">BankAccount</td>
75-
<td class="danger big"> <div class="progress">
76-
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
77-
<span class="sr-only">0.00% covered (danger)</span>
75+
<td class="warning big"> <div class="progress">
76+
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
77+
<span class="sr-only">55.56% covered (warning)</span>
7878
</div>
7979
</div>
8080
</td>
81-
<td class="danger small"><div align="right">0.00%</div></td>
82-
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
81+
<td class="warning small"><div align="right">55.56%</div></td>
82+
<td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
8383
<td class="warning big"> <div class="progress">
8484
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
8585
<span class="sr-only">75.00% covered (warning)</span>
@@ -89,18 +89,18 @@
8989
<td class="warning small"><div align="right">75.00%</div></td>
9090
<td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
9191
<td class="warning small">7.19</td>
92-
<td class="warning big"> <div class="progress">
93-
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
94-
<span class="sr-only">55.56% covered (warning)</span>
92+
<td class="danger big"> <div class="progress">
93+
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
94+
<span class="sr-only">0.00% covered (danger)</span>
9595
</div>
9696
</div>
9797
</td>
98-
<td class="warning small"><div align="right">55.56%</div></td>
99-
<td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
98+
<td class="danger small"><div align="right">0.00%</div></td>
99+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
100100
</tr>
101101

102102
<tr>
103-
<td class="success" colspan="4">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
103+
<td class="success">&nbsp;<a href="#6"><abbr title="getBalance()">getBalance</abbr></a></td>
104104
<td class="success big"> <div class="progress">
105105
<div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
106106
<span class="sr-only">100.00% covered (success)</span>
@@ -109,7 +109,6 @@
109109
</td>
110110
<td class="success small"><div align="right">100.00%</div></td>
111111
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
112-
<td class="success small">1</td>
113112
<td class="success big"> <div class="progress">
114113
<div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
115114
<span class="sr-only">100.00% covered (success)</span>
@@ -118,69 +117,74 @@
118117
</td>
119118
<td class="success small"><div align="right">100.00%</div></td>
120119
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
120+
<td class="success small">1</td>
121+
<td class="success" colspan="3"></td>
121122
</tr>
122123

123124
<tr>
124-
<td class="danger" colspan="4">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
125+
<td class="danger">&nbsp;<a href="#11"><abbr title="setBalance($balance)">setBalance</abbr></a></td>
125126
<td class="danger big"> <div class="progress">
126127
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
127128
<span class="sr-only">0.00% covered (danger)</span>
128129
</div>
129130
</div>
130131
</td>
131132
<td class="danger small"><div align="right">0.00%</div></td>
132-
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
133-
<td class="danger small">6</td>
133+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
134134
<td class="danger big"> <div class="progress">
135135
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
136136
<span class="sr-only">0.00% covered (danger)</span>
137137
</div>
138138
</div>
139139
</td>
140140
<td class="danger small"><div align="right">0.00%</div></td>
141-
<td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
141+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
142+
<td class="danger small">6</td>
143+
<td class="danger" colspan="3"></td>
142144
</tr>
143145

144146
<tr>
145-
<td class="success" colspan="4">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
147+
<td class="success">&nbsp;<a href="#20"><abbr title="depositMoney($balance)">depositMoney</abbr></a></td>
146148
<td class="success big"> <div class="progress">
147149
<div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
148150
<span class="sr-only">100.00% covered (success)</span>
149151
</div>
150152
</div>
151153
</td>
152154
<td class="success small"><div align="right">100.00%</div></td>
153-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
154-
<td class="success small">1</td>
155+
<td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
155156
<td class="success big"> <div class="progress">
156157
<div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
157158
<span class="sr-only">100.00% covered (success)</span>
158159
</div>
159160
</div>
160161
</td>
161162
<td class="success small"><div align="right">100.00%</div></td>
162-
<td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
163+
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
164+
<td class="success small">1</td>
165+
<td class="success" colspan="3"></td>
163166
</tr>
164167

165168
<tr>
166-
<td class="success" colspan="4">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
169+
<td class="success">&nbsp;<a href="#27"><abbr title="withdrawMoney($balance)">withdrawMoney</abbr></a></td>
167170
<td class="success big"> <div class="progress">
168171
<div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
169172
<span class="sr-only">100.00% covered (success)</span>
170173
</div>
171174
</div>
172175
</td>
173176
<td class="success small"><div align="right">100.00%</div></td>
174-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
175-
<td class="success small">1</td>
177+
<td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
176178
<td class="success big"> <div class="progress">
177179
<div class="progress-bar bg-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
178180
<span class="sr-only">100.00% covered (success)</span>
179181
</div>
180182
</div>
181183
</td>
182184
<td class="success small"><div align="right">100.00%</div></td>
183-
<td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
185+
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
186+
<td class="success small">1</td>
187+
<td class="success" colspan="3"></td>
184188
</tr>
185189

186190

0 commit comments

Comments
 (0)