Skip to content

Fix coverage for nested functions and classes #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix coverage for nested functions and classes #372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c9372
Fix coverage for nested functions and classes
kelunik Aug 15, 2015
44a1171
Add PHP 5.3 compability...
kelunik Aug 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/CodeCoverage/Report/Node/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ public function getNumTestedFunctions()
*/
protected function calculateStatistics()
{
$classStack = $functionStack = array();

if ($this->cacheTokens) {
$tokens = PHP_Token_Stream_CachingFactory::get($this->getPath());
} else {
Expand All @@ -367,6 +369,10 @@ protected function calculateStatistics()
if (isset($this->startLines[$lineNumber])) {
// Start line of a class.
if (isset($this->startLines[$lineNumber]['className'])) {
if (isset($currentClass)) {
$classStack[] = &$currentClass;
}

$currentClass = &$this->startLines[$lineNumber];
} // Start line of a trait.
elseif (isset($this->startLines[$lineNumber]['traitName'])) {
Expand All @@ -376,12 +382,15 @@ protected function calculateStatistics()
$currentMethod = &$this->startLines[$lineNumber];
} // Start line of a function.
elseif (isset($this->startLines[$lineNumber]['functionName'])) {
if (isset($currentFunction)) {
$functionStack[] = &$currentFunction;
}

$currentFunction = &$this->startLines[$lineNumber];
}
}

if (isset($this->coverageData[$lineNumber]) &&
$this->coverageData[$lineNumber] !== null) {
if (isset($this->coverageData[$lineNumber])) {
if (isset($currentClass)) {
$currentClass['executableLines']++;
}
Expand Down Expand Up @@ -425,6 +434,13 @@ protected function calculateStatistics()
// End line of a class.
if (isset($this->endLines[$lineNumber]['className'])) {
unset($currentClass);

if ($classStack) {
end($classStack);
$key = key($classStack);
$currentClass = &$classStack[$key];
unset($classStack[$key]);
}
} // End line of a trait.
elseif (isset($this->endLines[$lineNumber]['traitName'])) {
unset($currentTrait);
Expand All @@ -434,6 +450,13 @@ protected function calculateStatistics()
} // End line of a function.
elseif (isset($this->endLines[$lineNumber]['functionName'])) {
unset($currentFunction);

if ($functionStack) {
end($functionStack);
$key = key($functionStack);
$currentFunction = &$functionStack[$key];
unset($functionsStack[$key]);
}
}
}
}
Expand Down