Skip to content

Commit aa2996d

Browse files
sebastianbergmannsebastianbergmann
committed
Do not report details for anonymous classes and functions
1 parent 3f2d171 commit aa2996d

File tree

10 files changed

+58
-72
lines changed

10 files changed

+58
-72
lines changed

‎ChangeLog-6.0.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes of the PHP_CodeCoverage 6.0 release series are documented in
44

55
## [6.0.4] - 2018-MM-DD
66

7+
### Changed
8+
9+
* Implemented [#606](https://github.com/sebastianbergmann/php-code-coverage/issues/606): Do not report details for anonymous classes and functions
10+
711
### Fixed
812

913
* Fixed [#605](https://github.com/sebastianbergmann/php-code-coverage/issues/605): Method name missing from coverage report

‎src/Node/File.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,10 @@ private function processClasses(\PHP_Token_Stream $tokens): void
471471
$link = $this->getId() . '.html#';
472472

473473
foreach ($classes as $className => $class) {
474+
if (\strpos($className, 'anonymous') === 0) {
475+
continue;
476+
}
477+
474478
if (!empty($class['package']['namespace'])) {
475479
$className = $class['package']['namespace'] . '\\' . $className;
476480
}
@@ -489,6 +493,10 @@ private function processClasses(\PHP_Token_Stream $tokens): void
489493
];
490494

491495
foreach ($class['methods'] as $methodName => $method) {
496+
if (\strpos($methodName, 'anonymous') === 0) {
497+
continue;
498+
}
499+
492500
$this->classes[$className]['methods'][$methodName] = $this->newMethod($methodName, $method, $link);
493501

494502
foreach (\range($method['startLine'], $method['endLine']) as $lineNumber) {
@@ -522,6 +530,10 @@ private function processTraits(\PHP_Token_Stream $tokens): void
522530
];
523531

524532
foreach ($trait['methods'] as $methodName => $method) {
533+
if (\strpos($methodName, 'anonymous') === 0) {
534+
continue;
535+
}
536+
525537
$this->traits[$traitName]['methods'][$methodName] = $this->newMethod($methodName, $method, $link);
526538

527539
foreach (\range($method['startLine'], $method['endLine']) as $lineNumber) {
@@ -541,6 +553,10 @@ private function processFunctions(\PHP_Token_Stream $tokens): void
541553
$link = $this->getId() . '.html#';
542554

543555
foreach ($functions as $functionName => $function) {
556+
if (\strpos($functionName, 'anonymous') === 0) {
557+
continue;
558+
}
559+
544560
$this->functions[$functionName] = [
545561
'functionName' => $functionName,
546562
'signature' => $function['signature'],

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

Lines changed: 4 additions & 4 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">83%</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">87%</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,0,0,1,0,1], "Method Coverage"))
180+
.datum(getCoverageDistributionData([0,0,0,0,0,0,0,0,0,1,0,0], "Method Coverage"))
181181
.transition().duration(500).call(chart);
182182

183183
nv.utils.windowResize(chart.update);
@@ -227,7 +227,7 @@ <h3>Project Risks</h3>
227227
chart.yAxis.axisLabel('Cyclomatic Complexity');
228228

229229
d3.select('#classComplexity svg')
230-
.datum(getComplexityData([[87.5,2,"<a href=\"source_with_class_and_anonymous_function.php.html#3\">CoveredClassWithAnonymousFunctionInStaticMethod<\/a>"]], 'Class Complexity'))
230+
.datum(getComplexityData([[87.5,1,"<a href=\"source_with_class_and_anonymous_function.php.html#3\">CoveredClassWithAnonymousFunctionInStaticMethod<\/a>"]], 'Class Complexity'))
231231
.transition()
232232
.duration(500)
233233
.call(chart);
@@ -251,7 +251,7 @@ <h3>Project Risks</h3>
251251
chart.yAxis.axisLabel('Method Complexity');
252252

253253
d3.select('#methodComplexity svg')
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'))
254+
.datum(getComplexityData([[87.5,1,"<a href=\"source_with_class_and_anonymous_function.php.html#5\">CoveredClassWithAnonymousFunctionInStaticMethod::runAnonymous<\/a>"]], 'Method Complexity'))
255255
.transition()
256256
.duration(500)
257257
.call(chart);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
<td class="warning small"><div align="right">87.50%</div></td>
5252
<td class="warning small"><div align="right">7&nbsp;/&nbsp;8</div></td>
5353
<td class="danger big"> <div class="progress">
54-
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="50.00" aria-valuemin="0" aria-valuemax="100" style="width: 50.00%">
55-
<span class="sr-only">50.00% covered (danger)</span>
54+
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
55+
<span class="sr-only">0.00% covered (danger)</span>
5656
</div>
5757
</div>
5858
</td>
59-
<td class="danger small"><div align="right">50.00%</div></td>
60-
<td class="danger small"><div align="right">1&nbsp;/&nbsp;2</div></td>
59+
<td class="danger small"><div align="right">0.00%</div></td>
60+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
6161
<td class="danger big"> <div class="progress">
6262
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
6363
<span class="sr-only">0.00% covered (danger)</span>
@@ -79,13 +79,13 @@
7979
<td class="warning small"><div align="right">87.50%</div></td>
8080
<td class="warning small"><div align="right">7&nbsp;/&nbsp;8</div></td>
8181
<td class="danger big"> <div class="progress">
82-
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="50.00" aria-valuemin="0" aria-valuemax="100" style="width: 50.00%">
83-
<span class="sr-only">50.00% covered (danger)</span>
82+
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
83+
<span class="sr-only">0.00% covered (danger)</span>
8484
</div>
8585
</div>
8686
</td>
87-
<td class="danger small"><div align="right">50.00%</div></td>
88-
<td class="danger small"><div align="right">1&nbsp;/&nbsp;2</div></td>
87+
<td class="danger small"><div align="right">0.00%</div></td>
88+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
8989
<td class="danger big"> <div class="progress">
9090
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
9191
<span class="sr-only">0.00% covered (danger)</span>

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

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
<td class="danger small"><div align="right">0.00%</div></td>
5252
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
5353
<td class="danger big"> <div class="progress">
54-
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="50.00" aria-valuemin="0" aria-valuemax="100" style="width: 50.00%">
55-
<span class="sr-only">50.00% covered (danger)</span>
54+
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
55+
<span class="sr-only">0.00% covered (danger)</span>
5656
</div>
5757
</div>
5858
</td>
59-
<td class="danger small"><div align="right">50.00%</div></td>
60-
<td class="danger small"><div align="right">1&nbsp;/&nbsp;2</div></td>
59+
<td class="danger small"><div align="right">0.00%</div></td>
60+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
6161
<td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
6262
<td class="warning big"> <div class="progress">
6363
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="87.50" aria-valuemin="0" aria-valuemax="100" style="width: 87.50%">
@@ -80,14 +80,14 @@
8080
<td class="danger small"><div align="right">0.00%</div></td>
8181
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
8282
<td class="danger big"> <div class="progress">
83-
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="50.00" aria-valuemin="0" aria-valuemax="100" style="width: 50.00%">
84-
<span class="sr-only">50.00% covered (danger)</span>
83+
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
84+
<span class="sr-only">0.00% covered (danger)</span>
8585
</div>
8686
</div>
8787
</td>
88-
<td class="danger small"><div align="right">50.00%</div></td>
89-
<td class="danger small"><div align="right">1&nbsp;/&nbsp;2</div></td>
90-
<td class="danger small">2.01</td>
88+
<td class="danger small"><div align="right">0.00%</div></td>
89+
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
90+
<td class="danger small">1.00</td>
9191
<td class="warning big"> <div class="progress">
9292
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="87.50" aria-valuemin="0" aria-valuemax="100" style="width: 87.50%">
9393
<span class="sr-only">87.50% covered (warning)</span>
@@ -110,34 +110,13 @@
110110
<td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
111111
<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="83.33" aria-valuemin="0" aria-valuemax="100" style="width: 83.33%">
114-
<span class="sr-only">83.33% covered (warning)</span>
115-
</div>
116-
</div>
117-
</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>
120-
</tr>
121-
122-
<tr>
123-
<td class="success" colspan="4">&nbsp;<a href="#11"><abbr title="anonymousFunction (&amp;$val, $key)">anonymousFunction:11#41</abbr></a></td>
124-
<td class="success big"> <div class="progress">
125-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
126-
<span class="sr-only">100.00% covered (success)</span>
127-
</div>
128-
</div>
129-
</td>
130-
<td class="success small"><div align="right">100.00%</div></td>
131-
<td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
132-
<td class="success small">1</td>
133-
<td class="success big"> <div class="progress">
134-
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
135-
<span class="sr-only">100.00% covered (success)</span>
113+
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="87.50" aria-valuemin="0" aria-valuemax="100" style="width: 87.50%">
114+
<span class="sr-only">87.50% covered (warning)</span>
136115
</div>
137116
</div>
138117
</td>
139-
<td class="success small"><div align="right">100.00%</div></td>
140-
<td class="success small"><div align="right">2&nbsp;/&nbsp;2</div></td>
118+
<td class="warning small"><div align="right">87.50%</div></td>
119+
<td class="warning small"><div align="right">7&nbsp;/&nbsp;8</div></td>
141120
</tr>
142121

143122

‎tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/index.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<directory name="%s">
1212
<totals>
1313
<lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50"/>
14-
<methods count="2" tested="1" percent="50.00"/>
14+
<methods count="1" tested="0" percent="0.00"/>
1515
<functions count="0" tested="0" percent="0"/>
1616
<classes count="1" tested="0" percent="0.00"/>
1717
<traits count="0" tested="0" percent="0"/>
1818
</totals>
1919
<file name="source_with_class_and_anonymous_function.php" href="source_with_class_and_anonymous_function.php.xml">
2020
<totals>
2121
<lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50"/>
22-
<methods count="2" tested="1" percent="50.00"/>
22+
<methods count="1" tested="0" percent="0.00"/>
2323
<functions count="0" tested="0" percent="0"/>
2424
<classes count="1" tested="0" percent="0.00"/>
2525
<traits count="0" tested="0" percent="0"/>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
<file name="source_with_class_and_anonymous_function.php" path="/">
44
<totals>
55
<lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50"/>
6-
<methods count="2" tested="1" percent="50.00"/>
6+
<methods count="1" tested="0" percent="0.00"/>
77
<functions count="0" tested="0" percent="0"/>
88
<classes count="1" tested="0" percent="0.00"/>
99
<traits count="0" tested="0" percent="0"/>
1010
</totals>
11-
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" start="3" executable="8" executed="7" crap="2.01">
11+
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" start="3" executable="8" executed="7" crap="1">
1212
<package full="" name="" sub="" category=""/>
1313
<namespace name=""/>
14-
<method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.00" executable="6" executed="5" coverage="83.333333333333"/>
15-
<method name="anonymousFunction:11#41" signature="anonymousFunction (&amp;$val, $key)" start="11" end="13" crap="1" executable="2" executed="2" coverage="100"/>
14+
<method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.00" executable="8" executed="7" coverage="87.5"/>
1615
</class>
1716
<coverage>
1817
<line nr="7">

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
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="8" coveredstatements="7" elements="10" coveredelements="8"/>
6+
<metrics complexity="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="9" coveredelements="7"/>
77
</class>
88
<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"/>
12-
<line num="11" type="method" name="anonymousFunction:11#41" complexity="1" crap="1" count="1"/>
1312
<line num="12" type="stmt" count="1"/>
1413
<line num="13" type="stmt" count="1"/>
1514
<line num="14" type="stmt" count="1"/>
1615
<line num="17" type="stmt" count="1"/>
1716
<line num="18" type="stmt" count="1"/>
18-
<metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
17+
<metrics loc="19" ncloc="17" classes="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="9" coveredelements="7"/>
1918
</file>
20-
<metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
19+
<metrics files="1" loc="19" ncloc="17" classes="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="9" coveredelements="7"/>
2120
</project>
2221
</coverage>

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<timestamp>%s</timestamp>
55
<stats>
66
<name>Method Crap Stats</name>
7-
<methodCount>2</methodCount>
7+
<methodCount>1</methodCount>
88
<crapMethodCount>0</crapMethodCount>
99
<crapLoad>0</crapLoad>
10-
<totalCrap>2</totalCrap>
10+
<totalCrap>1</totalCrap>
1111
<crapMethodPercent>0</crapMethodPercent>
1212
</stats>
1313
<methods>
@@ -19,18 +19,7 @@
1919
<fullMethod>runAnonymous()</fullMethod>
2020
<crap>1</crap>
2121
<complexity>1</complexity>
22-
<coverage>83.33</coverage>
23-
<crapLoad>0</crapLoad>
24-
</method>
25-
<method>
26-
<package>global</package>
27-
<className>CoveredClassWithAnonymousFunctionInStaticMethod</className>
28-
<methodName>anonymousFunction:11#41</methodName>
29-
<methodSignature>anonymousFunction (&amp;$val, $key)</methodSignature>
30-
<fullMethod>anonymousFunction (&amp;$val, $key)</fullMethod>
31-
<crap>1</crap>
32-
<complexity>1</complexity>
33-
<coverage>100</coverage>
22+
<coverage>87.5</coverage>
3423
<crapLoad>0</crapLoad>
3524
</method>
3625
</methods>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Code Coverage Report:
55

66
Summary:
77
Classes: 0.00% (0/1)
8-
Methods: 50.00% (1/2)
8+
Methods: 0.00% (0/1)
99
Lines: 87.50% (7/8)
1010

1111
CoveredClassWithAnonymousFunctionInStaticMethod
12-
Methods: 50.00% ( 1/ 2) Lines: 87.50% ( 7/ 8)
12+
Methods: 0.00% ( 0/ 1) Lines: 87.50% ( 7/ 8)

0 commit comments

Comments
 (0)