Skip to content

Commit e8fcdc1

Browse files
Eliminate superfluous method calls.
1 parent 92fe890 commit e8fcdc1

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

PHP/CodeCoverage/Report/Clover.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
9595
$xmlFile = $xmlDocument->createElement('file');
9696
$xmlFile->setAttribute('name', $item->getPath());
9797

98-
$classes = array_merge($item->getClasses(), $item->getTraits());
99-
$coverage = $item->getCoverageData();
100-
$lines = array();
98+
$classes = array_merge($item->getClasses(), $item->getTraits());
99+
$coverage = $item->getCoverageData();
100+
$lines = array();
101+
$ignoredLines = $item->getIgnoredLines();
101102

102103
foreach ($classes as $className => $class) {
103104
$classStatements = 0;
@@ -112,7 +113,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
112113
for ($i = $method['startLine'];
113114
$i <= $method['endLine'];
114115
$i++) {
115-
if ($item->isLineIgnored($i)) {
116+
if (isset($ignoredLines[$i])) {
116117
continue;
117118
}
118119

@@ -224,7 +225,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
224225
foreach ($coverage as $line => $data) {
225226
if ($data === NULL ||
226227
isset($lines[$line]) ||
227-
$item->isLineIgnored($line)) {
228+
isset($ignoredLines[$line])) {
228229
continue;
229230
}
230231

@@ -236,7 +237,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
236237
ksort($lines);
237238

238239
foreach ($lines as $line => $data) {
239-
if ($item->isLineIgnored($line)) {
240+
if (isset($ignoredLines[$line])) {
240241
continue;
241242
}
242243

PHP/CodeCoverage/Report/Node/File.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,14 @@ public function getCoverageData()
183183
return $this->coverageData;
184184
}
185185

186+
/**
187+
* @return array
188+
*/
189+
public function getIgnoredLines()
190+
{
191+
return $this->ignoredLines;
192+
}
193+
186194
/**
187195
* Returns the classes of this node.
188196
*
@@ -376,15 +384,6 @@ public function getNumTestedFunctions()
376384
return $this->numTestedFunctions;
377385
}
378386

379-
/**
380-
* @param integer $line
381-
* @return boolean
382-
*/
383-
public function isLineIgnored($line)
384-
{
385-
return isset($this->ignoredLines[$line]);
386-
}
387-
388387
/**
389388
* Calculates coverage statistics for the file.
390389
*/

0 commit comments

Comments
 (0)