Skip to content

Commit 52ba946

Browse files
sebastianbergmannsebastianbergmann
committed
Cosmetics: Handle 0/0 for {lines|functions|methods|classes|traits} coverage consistently.
1 parent b90fc82 commit 52ba946

File tree

7 files changed

+65
-52
lines changed

7 files changed

+65
-52
lines changed

‎PHP/CodeCoverage/Report/HTML/Renderer.php‎

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -139,58 +139,78 @@ protected function getColorLevel($percent)
139139
*/
140140
protected function renderItemTemplate(Text_Template $template, array $data)
141141
{
142+
$classesBar = ' ';
143+
$classesColor = 'snow';
144+
$classesLevel = 'None';
145+
$classesNumber = ' ';
146+
142147
if (isset($data['numClasses']) && $data['numClasses'] > 0) {
143148
list($classesColor, $classesLevel) = $this->getColorLevel(
144149
$data['testedClassesPercent']
145150
);
146151

147152
$classesNumber = $data['numTestedClasses'] . ' / ' .
148153
$data['numClasses'];
149-
} else {
150-
$classesColor = 'snow';
151-
$classesLevel = 'None';
152-
$classesNumber = ' ';
154+
155+
$classesBar = $this->getCoverageBar(
156+
$classesColor, $data['testedClassesPercent']
157+
);
153158
}
154159

160+
$methodsBar = ' ';
161+
$methodsColor = 'snow';
162+
$methodsLevel = 'None';
163+
$methodsNumber = ' ';
164+
155165
if ($data['numMethods'] > 0) {
156166
list($methodsColor, $methodsLevel) = $this->getColorLevel(
157167
$data['testedMethodsPercent']
158168
);
159169

160170
$methodsNumber = $data['numTestedMethods'] . ' / ' .
161171
$data['numMethods'];
162-
} else {
163-
$methodsColor = 'snow';
164-
$methodsLevel = 'None';
165-
$methodsNumber = ' ';
172+
173+
$methodsBar = $this->getCoverageBar(
174+
$methodsColor, $data['testedMethodsPercent']
175+
);
166176
}
167177

168-
list($linesColor, $linesLevel) = $this->getColorLevel(
169-
$data['linesExecutedPercent']
170-
);
178+
$linesBar = ' ';
179+
$linesColor = 'snow';
180+
$linesLevel = 'None';
181+
$linesNumber = ' ';
182+
183+
if ($data['numExecutableLines'] > 0) {
184+
list($linesColor, $linesLevel) = $this->getColorLevel(
185+
$data['linesExecutedPercent']
186+
);
187+
188+
$linesNumber = $data['numExecutedLines'] . ' / ' .
189+
$data['numExecutableLines'];
190+
191+
$linesBar = $this->getCoverageBar(
192+
$linesColor, $data['linesExecutedPercent']
193+
);
194+
}
171195

172196
$template->setVar(
173197
array(
174198
'itemClass' => isset($data['itemClass']) ? $data['itemClass'] : '',
175199
'icon' => isset($data['icon']) ? $data['icon'] : '',
176200
'crap' => isset($data['crap']) ? $data['crap'] : '',
177201
'name' => $data['name'],
202+
'lines_bar' => $linesBar,
178203
'lines_color' => $linesColor,
179-
'lines_executed_width' => $data['linesExecutedPercent'],
180-
'lines_not_executed_width' => 100 - $data['linesExecutedPercent'],
181204
'lines_executed_percent' => $data['linesExecutedPercentAsString'],
182205
'lines_level' => $linesLevel,
183-
'num_executed_lines' => $data['numExecutedLines'],
184-
'num_executable_lines' => $data['numExecutableLines'],
206+
'lines_number' => $linesNumber,
207+
'methods_bar' => $methodsBar,
185208
'methods_color' => $methodsColor,
186-
'methods_tested_width' => $data['testedMethodsPercent'],
187-
'methods_not_tested_width' => 100 - $data['testedMethodsPercent'],
188209
'methods_tested_percent' => $data['testedMethodsPercentAsString'],
189210
'methods_level' => $methodsLevel,
190211
'methods_number' => $methodsNumber,
212+
'classes_bar' => $classesBar,
191213
'classes_color' => $classesColor,
192-
'classes_tested_width' => isset($data['testedClassesPercent']) ? $data['testedClassesPercent'] : '',
193-
'classes_not_tested_width' => isset($data['testedClassesPercent']) ? 100 - $data['testedClassesPercent'] : '',
194214
'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
195215
'classes_level' => $classesLevel,
196216
'classes_number' => $classesNumber
@@ -236,4 +256,13 @@ protected function setCommonTemplateVariables(Text_Template $template, $title, P
236256
)
237257
);
238258
}
259+
260+
protected function getCoverageBar($color, $percent)
261+
{
262+
$template = new Text_Template($this->templatePath . 'coverage_bar.html');
263+
264+
$template->setVar(array('color' => $color, 'percent' => $percent));
265+
266+
return $template->render();
267+
}
239268
}

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="coverBarOutline" title="{percent}">
2+
<div class="size {color}" style="width:{percent}%" title="{percent}"></div>
3+
</div>

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
<tr>
22
<td class="{itemClass}">{icon}{name}</td>
3-
<td class="coverBar">
4-
<div class="coverBarOutline" title="{lines_executed_percent}">
5-
<div class="size {lines_color}" style="width:{lines_executed_width}%" title="{lines_executed_percent}"></div>
6-
</div>
7-
</td>
3+
<td class="coverBar">{lines_bar}</td>
84
<td class="coverPer{lines_level}">{lines_executed_percent}</td>
9-
<td class="coverNum{lines_level}">{num_executed_lines} / {num_executable_lines}</td>
10-
<td class="coverBar">
11-
<div class="coverBarOutline" title="{methods_tested_percent}">
12-
<div class="size {methods_color}" style="width:{methods_tested_width}%" title="{methods_tested_percent}"></div>
13-
</div>
14-
</td>
5+
<td class="coverNum{lines_level}">{lines_number}</td>
6+
<td class="coverBar">{methods_bar}</td>
157
<td class="coverPer{methods_level}">{methods_tested_percent}</td>
168
<td class="coverNum{methods_level}">{methods_number}</td>
17-
<td class="coverBar">
18-
<div class="coverBarOutline" title="{classes_tested_percent}">
19-
<div class="size {classes_color}" style="width:{classes_tested_width}%" title="{classes_tested_percent}"></div>
20-
</div>
21-
</td>
9+
<td class="coverBar">{classes_bar}</td>
2210
<td class="coverPer{classes_level}">{classes_tested_percent}</td>
2311
<td class="coverNum{classes_level}">{classes_number}</td>
2412
</tr>

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
<tr>
22
<td class="{itemClass}">{name}</td>
3-
<td class="coverBar">
4-
<div class="coverBarOutline" title="{classes_tested_percent}">
5-
<div class="size {classes_color}" style="width:{classes_tested_width}%" title="{classes_tested_percent}"></div>
6-
</div>
7-
</td>
3+
<td class="coverBar">{classes_bar}</td>
84
<td class="coverPer{classes_level}">{classes_tested_percent}</td>
95
<td class="coverNum{classes_level}">{classes_number}</td>
10-
<td class="coverBar">
11-
<div class="coverBarOutline" title="{methods_tested_percent}">
12-
<div class="size {methods_color}" style="width:{methods_tested_width}%" title="{methods_tested_percent}"></div>
13-
</div>
14-
</td>
6+
<td class="coverBar">{methods_bar}</td>
157
<td class="coverPer{methods_level}">{methods_tested_percent}</td>
168
<td class="coverNum{methods_level}">{methods_number}</td>
179
<td class="crap">{crap}</td>
18-
<td class="coverBar">
19-
<div class="coverBarOutline" title="{lines_executed_percent}">
20-
<div class="size {lines_color}" style="width:{lines_executed_width}%" title="{lines_executed_percent}"></div>
21-
</div>
22-
</td>
10+
<td class="coverBar">{lines_bar}</td>
2311
<td class="coverPer{lines_level}">{lines_executed_percent}</td>
24-
<td class="coverNum{lines_level}">{num_executed_lines} / {num_executable_lines}</td>
12+
<td class="coverNum{lines_level}">{lines_number}</td>
2513
</tr>
2614

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
</div>
1515
</td>
1616
<td class="coverPer{lines_level}">{lines_executed_percent}</td>
17-
<td class="coverNum{lines_level}">{num_executed_lines} / {num_executable_lines}</td>
17+
<td class="coverNum{lines_level}">{lines_number}</td>
1818
</tr>
1919

‎PHP/CodeCoverage/Util.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
231231
*/
232232
public static function percent($a, $b, $asString = FALSE, $fixedWidth = FALSE)
233233
{
234+
if ($asString && $b == 0) {
235+
return '';
236+
}
237+
234238
if ($b > 0) {
235239
$percent = ($a / $b) * 100;
236240
} else {

‎package.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<file baseinstalldir="/" name="close12_1.gif" role="php" />
4545
<file baseinstalldir="/" name="container.css" role="php" />
4646
<file baseinstalldir="/" name="container-min.js" role="php" />
47+
<file baseinstalldir="/" name="coverage_bar.html.dist" role="php" />
4748
<file baseinstalldir="/" name="dashboard.html.dist" role="php" />
4849
<file baseinstalldir="/" name="directory.html.dist" role="php" />
4950
<file baseinstalldir="/" name="directory_item.html.dist" role="php" />

0 commit comments

Comments
 (0)