diff options
Diffstat (limited to 'buildscripts/phing/classes/phing/tasks/ext/coverage/CoverageMerger.php')
| -rwxr-xr-x[-rw-r--r--] | buildscripts/phing/classes/phing/tasks/ext/coverage/CoverageMerger.php | 221 |
1 files changed, 124 insertions, 97 deletions
diff --git a/buildscripts/phing/classes/phing/tasks/ext/coverage/CoverageMerger.php b/buildscripts/phing/classes/phing/tasks/ext/coverage/CoverageMerger.php index 99bcc7c4..71eba460 100644..100755 --- a/buildscripts/phing/classes/phing/tasks/ext/coverage/CoverageMerger.php +++ b/buildscripts/phing/classes/phing/tasks/ext/coverage/CoverageMerger.php @@ -1,6 +1,6 @@ <?php /** - * $Id: CoverageMerger.php 59 2006-04-28 14:49:47Z mrook $ + * $Id: 83f3748d0690f9fc69c2618191f272e5661c0501 $ * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -24,104 +24,131 @@ require_once 'phing/system/util/Properties.php'; /** * Saves coverage output of the test to a specified database * - * @author Michiel Rook <michiel@trendserver.nl> - * @version $Id: CoverageMerger.php 59 2006-04-28 14:49:47Z mrook $ + * @author Michiel Rook <mrook@php.net> + * @version $Id: 83f3748d0690f9fc69c2618191f272e5661c0501 $ * @package phing.tasks.ext.coverage * @since 2.1.0 */ class CoverageMerger { - private static function mergeCodeCoverage($left, $right) - { - $coverageMerged = array(); - - reset($left); - reset($right); - - while (current($left) && current($right)) - { - $linenr_left = key($left); - $linenr_right = key($right); - - if ($linenr_left < $linenr_right) - { - $coverageMerged[$linenr_left] = current($left); - - next($left); - } - else - if ($linenr_right < $linenr_left) - { - $coverageMerged[$linenr_right] = current($right); - next($right); - } - else - { - if (current($left) < 0) - { - $coverageMerged[$linenr_right] = current($right); - } - else - if (current($right) < 0) - { - $coverageMerged[$linenr_right] = current($left); - } - else - { - $coverageMerged[$linenr_right] = current($left) + current($right); - } - - next($left); - next($right); - } - } - - while (current($left)) - { - $coverageMerged[key($left)] = current($left); - next($left); - } - - while (current($right)) - { - $coverageMerged[key($right)] = current($right); - next($right); - } - - return $coverageMerged; - } - - static function merge($project, $codeCoverageInformation) - { - $database = new PhingFile($project->getProperty('coverage.database')); - - $props = new Properties(); - $props->load($database); - - $coverageTotal = $codeCoverageInformation; - - foreach ($coverageTotal as $coverage) - { - foreach ($coverage as $filename => $coverageFile) - { - $filename = strtolower($filename); - - if ($props->getProperty($filename) != null) - { - $file = unserialize($props->getProperty($filename)); - $left = $file['coverage']; - $right = $coverageFile; - - $coverageMerged = CoverageMerger::mergeCodeCoverage($left, $right); - - $file['coverage'] = $coverageMerged; - - $props->setProperty($filename, serialize($file)); - } - } - } - - $props->store($database); - } -} -?>
\ No newline at end of file + private static function mergeCodeCoverage($left, $right) + { + $coverageMerged = array(); + + reset($left); + reset($right); + + while (current($left) !== false && current($right) !== false) { + $linenr_left = key($left); + $linenr_right = key($right); + + if ($linenr_left < $linenr_right) { + $coverageMerged[$linenr_left] = current($left); + next($left); + } elseif ($linenr_right < $linenr_left) { + $coverageMerged[$linenr_right] = current($right); + next($right); + } else { + if ((current($left) < 0) || (current($right) < 0)) { + $coverageMerged[$linenr_right] = current($right); + } else { + $coverageMerged[$linenr_right] = current($left) + current($right); + } + + next($left); + next($right); + } + } + + while (current($left) !== false) { + $coverageMerged[key($left)] = current($left); + next($left); + } + + while (current($right) !== false) { + $coverageMerged[key($right)] = current($right); + next($right); + } + + return $coverageMerged; + } + + /** + * @param Project $project + * @return Properties + * @throws BuildException + */ + protected static function _getDatabase($project) + { + $coverageDatabase = $project->getProperty('coverage.database'); + + if (!$coverageDatabase) { + throw new BuildException("Property coverage.database is not set - please include coverage-setup in your build file"); + } + + $database = new PhingFile($coverageDatabase); + + $props = new Properties(); + $props->load($database); + + return $props; + } + + public static function getWhiteList($project) + { + $whitelist = array(); + $props = self::_getDatabase($project); + + foreach ($props->getProperties() as $property) { + $data = unserialize($property); + $whitelist[] = $data['fullname']; + } + + return $whitelist; + } + + public static function merge($project, $codeCoverageInformation) + { + $props = self::_getDatabase($project); + + $coverageTotal = $codeCoverageInformation; + + foreach ($coverageTotal as $filename => $data) { + $ignoreLines = PHP_CodeCoverage_Util::getLinesToBeIgnored($filename); + + $lines = array(); + $filename = strtolower($filename); + + if ($props->getProperty($filename) != null) { + foreach ($data as $_line => $_data) { + if (is_array($_data)) { + $count = count($_data); + } else if(isset($ignoreLines[$_line])) { + // line is marked as ignored + $count = 1; + } else if ($_data == -1) { + // not executed + $count = -1; + } else if ($_data == -2) { + // dead code + $count = -2; + } + + $lines[$_line] = $count; + } + + ksort($lines); + + $file = unserialize($props->getProperty($filename)); + $left = $file['coverage']; + + $coverageMerged = CoverageMerger::mergeCodeCoverage($left, $lines); + + $file['coverage'] = $coverageMerged; + $props->setProperty($filename, serialize($file)); + } + } + + $props->store(); + } +}
\ No newline at end of file |