Skip to content

Commit d4a11b4

Browse files
sebastianbergmannsebastianbergmann
committed
1 parent 8c11ea5 commit d4a11b4

File tree

8 files changed

+38
-18
lines changed

8 files changed

+38
-18
lines changed

‎ChangeLog-6.0.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 6.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
44

5+
## [6.0.4] - 2018-MM-DD
6+
7+
### Fixed
8+
9+
* Fixed [#605](https://github.com/sebastianbergmann/php-code-coverage/issues/605): Method name missing from coverage report
10+
511
## [6.0.3] - 2018-04-06
612

713
### Fixed
@@ -34,6 +40,7 @@ All notable changes of the PHP_CodeCoverage 6.0 release series are documented in
3440
* Implemented [#562](https://github.com/sebastianbergmann/php-code-coverage/issues/562): Remove code specific to Hack language constructs
3541
* Implemented [#563](https://github.com/sebastianbergmann/php-code-coverage/issues/563): Drop support for PHP 7.0
3642

43+
[6.0.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/6.0.3...6.0.4
3744
[6.0.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/6.0.2...6.0.3
3845
[6.0.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/6.0.1...6.0.2
3946
[6.0.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/6.0.0...6.0.1

‎src/Node/File.php

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,9 @@ public function getNumTestedFunctions(): int
335335

336336
private function calculateStatistics(): void
337337
{
338-
$classStack = $functionStack = [];
338+
$classStack = [];
339+
$methodStack = [];
340+
$functionStack = [];
339341

340342
if ($this->cacheTokens) {
341343
$tokens = \PHP_Token_Stream_CachingFactory::get($this->getPath());
@@ -356,11 +358,15 @@ private function calculateStatistics(): void
356358
}
357359

358360
$currentClass = &$this->startLines[$lineNumber];
359-
} elseif (isset($this->startLines[$lineNumber]['traitName'])) {
361+
} elseif (isset($this->startLines[$lineNumber]['traitName'])) {
360362
$currentTrait = &$this->startLines[$lineNumber];
361363
} elseif (isset($this->startLines[$lineNumber]['methodName'])) {
364+
if (isset($currentMethod)) {
365+
$methodStack[] = &$currentMethod;
366+
}
367+
362368
$currentMethod = &$this->startLines[$lineNumber];
363-
} elseif (isset($this->startLines[$lineNumber]['functionName'])) {
369+
} elseif (isset($this->startLines[$lineNumber]['functionName'])) {
364370
if (isset($currentFunction)) {
365371
$functionStack[] = &$currentFunction;
366372
}
@@ -421,6 +427,13 @@ private function calculateStatistics(): void
421427
unset($currentTrait);
422428
} elseif (isset($this->endLines[$lineNumber]['methodName'])) {
423429
unset($currentMethod);
430+
431+
if ($methodStack) {
432+
\end($methodStack);
433+
$key = \key($methodStack);
434+
$currentMethod = &$methodStack[$key];
435+
unset($methodStack[$key]);
436+
}
424437
} elseif (isset($this->endLines[$lineNumber]['functionName'])) {
425438
unset($currentFunction);
426439

‎tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/dashboard.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ <h3>Insufficient Coverage</h3>
112112
</tr>
113113
</thead>
114114
<tbody>
115-
<tr><td><a href="source_with_class_and_anonymous_function.php.html#5"><abbr title="CoveredClassWithAnonymousFunctionInStaticMethod::runAnonymous">runAnonymous</abbr></a></td><td class="text-right">66%</td></tr>
115+
<tr><td><a href="source_with_class_and_anonymous_function.php.html#5"><abbr title="CoveredClassWithAnonymousFunctionInStaticMethod::runAnonymous">runAnonymous</abbr></a></td><td class="text-right">83%</td></tr>
116116

117117
</tbody>
118118
</table>
@@ -177,7 +177,7 @@ <h3>Project Risks</h3>
177177
.yAxis.tickFormat(d3.format('d'));
178178

179179
d3.select('#methodCoverageDistribution svg')
180-
.datum(getCoverageDistributionData([0,0,0,0,0,0,0,1,0,0,0,1], "Method Coverage"))
180+
.datum(getCoverageDistributionData([0,0,0,0,0,0,0,0,0,1,0,1], "Method Coverage"))
181181
.transition().duration(500).call(chart);
182182

183183
nv.utils.windowResize(chart.update);
@@ -251,7 +251,7 @@ <h3>Project Risks</h3>
251251
chart.yAxis.axisLabel('Method Complexity');
252252

253253
d3.select('#methodComplexity svg')
254-
.datum(getComplexityData([[66.666666666667,1,"<a href=\"source_with_class_and_anonymous_function.php.html#5\">CoveredClassWithAnonymousFunctionInStaticMethod::runAnonymous<\/a>"],[100,1,"<a href=\"source_with_class_and_anonymous_function.php.html#11\">CoveredClassWithAnonymousFunctionInStaticMethod::anonymousFunction:11#41<\/a>"]], 'Method Complexity'))
254+
.datum(getComplexityData([[83.333333333333,1,"<a href=\"source_with_class_and_anonymous_function.php.html#5\">CoveredClassWithAnonymousFunctionInStaticMethod::runAnonymous<\/a>"],[100,1,"<a href=\"source_with_class_and_anonymous_function.php.html#11\">CoveredClassWithAnonymousFunctionInStaticMethod::anonymousFunction:11#41<\/a>"]], 'Method Complexity'))
255255
.transition()
256256
.duration(500)
257257
.call(chart);

‎tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@
108108
</td>
109109
<td class="danger small"><div align="right">0.00%</div></td>
110110
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
111-
<td class="danger small">1.04</td>
111+
<td class="danger small">1.00</td>
112112
<td class="warning big"> <div class="progress">
113-
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="66.67" aria-valuemin="0" aria-valuemax="100" style="width: 66.67%">
114-
<span class="sr-only">66.67% covered (warning)</span>
113+
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="83.33" aria-valuemin="0" aria-valuemax="100" style="width: 83.33%">
114+
<span class="sr-only">83.33% covered (warning)</span>
115115
</div>
116116
</div>
117117
</td>
118-
<td class="warning small"><div align="right">66.67%</div></td>
119-
<td class="warning small"><div align="right">2&nbsp;/&nbsp;3</div></td>
118+
<td class="warning small"><div align="right">83.33%</div></td>
119+
<td class="warning small"><div align="right">5&nbsp;/&nbsp;6</div></td>
120120
</tr>
121121

122122
<tr>

‎tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" start="3" executable="8" executed="7" crap="2.01">
1212
<package full="" name="" sub="" category=""/>
1313
<namespace name=""/>
14-
<method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.04" executable="3" executed="2" coverage="66.666666666667"/>
14+
<method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.00" executable="6" executed="5" coverage="83.333333333333"/>
1515
<method name="anonymousFunction:11#41" signature="anonymousFunction (&amp;$val, $key)" start="11" end="13" crap="1" executable="2" executed="2" coverage="100"/>
1616
</class>
1717
<coverage>

‎tests/_files/class-with-anonymous-function-clover.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<project timestamp="%i">
44
<file name="%s/source_with_class_and_anonymous_function.php">
55
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
6-
<metrics complexity="2" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
6+
<metrics complexity="2" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
77
</class>
8-
<line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1.04" count="1"/>
8+
<line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1.00" count="1"/>
99
<line num="7" type="stmt" count="1"/>
1010
<line num="9" type="stmt" count="1"/>
1111
<line num="10" type="stmt" count="0"/>

‎tests/_files/class-with-anonymous-function-crap4j.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<methodCount>2</methodCount>
88
<crapMethodCount>0</crapMethodCount>
99
<crapLoad>0</crapLoad>
10-
<totalCrap>2.04</totalCrap>
10+
<totalCrap>2</totalCrap>
1111
<crapMethodPercent>0</crapMethodPercent>
1212
</stats>
1313
<methods>
@@ -17,9 +17,9 @@
1717
<methodName>runAnonymous</methodName>
1818
<methodSignature>runAnonymous()</methodSignature>
1919
<fullMethod>runAnonymous()</fullMethod>
20-
<crap>1.04</crap>
20+
<crap>1</crap>
2121
<complexity>1</complexity>
22-
<coverage>66.67</coverage>
22+
<coverage>83.33</coverage>
2323
<crapLoad>0</crapLoad>
2424
</method>
2525
<method>

‎tests/_files/class-with-anonymous-function-text.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Code Coverage Report:
99
Lines: 87.50% (7/8)
1010

1111
CoveredClassWithAnonymousFunctionInStaticMethod
12-
Methods: 50.00% ( 1/ 2) Lines: 80.00% ( 4/ 5)
12+
Methods: 50.00% ( 1/ 2) Lines: 87.50% ( 7/ 8)

0 commit comments

Comments
 (0)