Skip to content

Commit 982ce79

Browse files
sebastianbergmannsebastianbergmann
committed
1 parent 661f34d commit 982ce79

File tree

3 files changed

+54
-59
lines changed

3 files changed

+54
-59
lines changed

‎ChangeLog-5.3.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes of the PHP_CodeCoverage 5.3 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
44

5+
## [5.3.1] - 2017-MM-DD
6+
7+
### Fixed
8+
9+
* Fixed [#559](https://github.com/sebastianbergmann/php-code-coverage/issues/559): Ignored classes and methods are reported as 100% covered
10+
511
## [5.3.0] - 2017-12-06
612

713
### Added
@@ -12,5 +18,6 @@ All notable changes of the PHP_CodeCoverage 5.3 release series are documented in
1218

1319
* Fixed [#564](https://github.com/sebastianbergmann/php-code-coverage/issues/564): `setDisableIgnoredLines(true)` disables more than it should
1420

21+
[5.3.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.3.0...5.3.1
1522
[5.3.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.2...5.3.0
1623

‎src/Report/Html/Renderer/File.php‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,23 @@ protected function renderItems(FileNode $node)
131131
*/
132132
protected function renderTraitOrClassItems(array $items, \Text_Template $template, \Text_Template $methodItemTemplate)
133133
{
134+
$buffer = '';
135+
134136
if (empty($items)) {
135-
return '';
137+
return $buffer;
136138
}
137139

138-
$buffer = '';
139-
140140
foreach ($items as $name => $item) {
141-
$numMethods = \count($item['methods']);
141+
$numMethods = 0;
142142
$numTestedMethods = 0;
143143

144144
foreach ($item['methods'] as $method) {
145-
if ($method['executedLines'] == $method['executableLines']) {
146-
$numTestedMethods++;
145+
if ($method['executableLines'] > 0) {
146+
$numMethods++;
147+
148+
if ($method['executedLines'] === $method['executableLines']) {
149+
$numTestedMethods++;
150+
}
147151
}
148152
}
149153

@@ -244,7 +248,16 @@ protected function renderFunctionItems(array $functions, \Text_Template $templat
244248
*/
245249
protected function renderFunctionOrMethodItem(\Text_Template $template, array $item, $indent = '')
246250
{
247-
$numTestedItems = $item['executedLines'] == $item['executableLines'] ? 1 : 0;
251+
$numMethods = 0;
252+
$numTestedMethods = 0;
253+
254+
if ($item['executableLines'] > 0) {
255+
$numMethods = 1;
256+
257+
if ($item['executedLines'] === $item['executableLines']) {
258+
$numTestedMethods = 1;
259+
}
260+
}
248261

249262
return $this->renderItemTemplate(
250263
$template,
@@ -256,8 +269,8 @@ protected function renderFunctionOrMethodItem(\Text_Template $template, array $i
256269
\htmlspecialchars($item['signature']),
257270
isset($item['functionName']) ? $item['functionName'] : $item['methodName']
258271
),
259-
'numMethods' => 1,
260-
'numTestedMethods' => $numTestedItems,
272+
'numMethods' => $numMethods,
273+
'numTestedMethods' => $numTestedMethods,
261274
'linesExecutedPercent' => Util::percent(
262275
$item['executedLines'],
263276
$item['executableLines'],
@@ -271,12 +284,12 @@ protected function renderFunctionOrMethodItem(\Text_Template $template, array $i
271284
'numExecutedLines' => $item['executedLines'],
272285
'numExecutableLines' => $item['executableLines'],
273286
'testedMethodsPercent' => Util::percent(
274-
$numTestedItems,
287+
$numTestedMethods,
275288
1,
276289
false
277290
),
278291
'testedMethodsPercentAsString' => Util::percent(
279-
$numTestedItems,
292+
$numTestedMethods,
280293
1,
281294
true
282295
),

‎tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html‎

Lines changed: 23 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,11 @@
6565
</tr>
6666

6767
<tr>
68-
<td class="success" colspan="4"><a href="#28"><abbr title="baz()">baz</abbr></a></td>
69-
<td class="success big"> <div class="progress">
70-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
71-
<span class="sr-only">100.00% covered (success)</span>
72-
</div>
73-
</div>
74-
</td>
75-
<td class="success small"><div align="right">100.00%</div></td>
76-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
77-
<td class="success small">1</td>
68+
<td class="" colspan="4"><a href="#28"><abbr title="baz()">baz</abbr></a></td>
69+
<td class=" big"></td>
70+
<td class=" small"><div align="right">n/a</div></td>
71+
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
72+
<td class=" small">1</td>
7873
<td class=" big"></td>
7974
<td class=" small"><div align="right">n/a</div></td>
8075
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
@@ -85,31 +80,21 @@
8580
<td class=" big"></td>
8681
<td class=" small"><div align="right">n/a</div></td>
8782
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
88-
<td class="success big"> <div class="progress">
89-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
90-
<span class="sr-only">100.00% covered (success)</span>
91-
</div>
92-
</div>
93-
</td>
94-
<td class="success small"><div align="right">100.00%</div></td>
95-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
96-
<td class="success small">1</td>
83+
<td class=" big"></td>
84+
<td class=" small"><div align="right">n/a</div></td>
85+
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
86+
<td class=" small">1</td>
9787
<td class=" big"></td>
9888
<td class=" small"><div align="right">n/a</div></td>
9989
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
10090
</tr>
10191

10292
<tr>
103-
<td class="success" colspan="4">&nbsp;<a href="#13"><abbr title="bar()">bar</abbr></a></td>
104-
<td class="success big"> <div class="progress">
105-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
106-
<span class="sr-only">100.00% covered (success)</span>
107-
</div>
108-
</div>
109-
</td>
110-
<td class="success small"><div align="right">100.00%</div></td>
111-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
112-
<td class="success small">1</td>
93+
<td class="" colspan="4">&nbsp;<a href="#13"><abbr title="bar()">bar</abbr></a></td>
94+
<td class=" big"></td>
95+
<td class=" small"><div align="right">n/a</div></td>
96+
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
97+
<td class=" small">1</td>
11398
<td class=" big"></td>
11499
<td class=" small"><div align="right">n/a</div></td>
115100
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
@@ -120,31 +105,21 @@
120105
<td class=" big"></td>
121106
<td class=" small"><div align="right">n/a</div></td>
122107
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
123-
<td class="success big"> <div class="progress">
124-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
125-
<span class="sr-only">100.00% covered (success)</span>
126-
</div>
127-
</div>
128-
</td>
129-
<td class="success small"><div align="right">100.00%</div></td>
130-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
131-
<td class="success small">1</td>
108+
<td class=" big"></td>
109+
<td class=" small"><div align="right">n/a</div></td>
110+
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
111+
<td class=" small">1</td>
132112
<td class=" big"></td>
133113
<td class=" small"><div align="right">n/a</div></td>
134114
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
135115
</tr>
136116

137117
<tr>
138-
<td class="success" colspan="4">&nbsp;<a href="#23"><abbr title="foo()">foo</abbr></a></td>
139-
<td class="success big"> <div class="progress">
140-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
141-
<span class="sr-only">100.00% covered (success)</span>
142-
</div>
143-
</div>
144-
</td>
145-
<td class="success small"><div align="right">100.00%</div></td>
146-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
147-
<td class="success small">1</td>
118+
<td class="" colspan="4">&nbsp;<a href="#23"><abbr title="foo()">foo</abbr></a></td>
119+
<td class=" big"></td>
120+
<td class=" small"><div align="right">n/a</div></td>
121+
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>
122+
<td class=" small">1</td>
148123
<td class=" big"></td>
149124
<td class=" small"><div align="right">n/a</div></td>
150125
<td class=" small"><div align="right">0&nbsp;/&nbsp;0</div></td>

0 commit comments

Comments
 (0)