Merge branch 'report-refactoring' of github.com:sebastianbergmann/php-code-coverage into report-refactoring

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -92,6 +92,13 @@ class PHP_CodeCoverage
      */
     protected $currentId;
 
+    /**
+     * SHA1 checksum of covered files.
+     *
+     * @var array
+     */
+    protected $checksums = array();
+
     /**
      * Code coverage data.
      *
@@ -310,9 +317,16 @@ public function append(array $data, $id = NULL)
      * Merges the data from another instance of PHP_CodeCoverage.
      *
      * @param PHP_CodeCoverage $that
+     * @param boolean          $matchPaths
      */
-    public function merge(PHP_CodeCoverage $that)
+    public function merge(PHP_CodeCoverage $that, $matchPaths = FALSE)
     {
+        if ($matchPaths) {
+            $thatData = $this->matchPaths($that->checksums, $that->data);
+        } else {
+            $thatData = $that->data;
+        }
+
         foreach ($that->data as $file => $lines) {
             if (!isset($this->data[$file])) {
                 if (!$this->filter->isFiltered($file)) {
@@ -469,7 +483,8 @@ protected function initializeFilesThatAreSeenTheFirstTime($data)
     {
         foreach ($data as $file => $lines) {
             if (!isset($this->data[$file])) {
-                $this->data[$file] = array();
+                $this->checksums[$file] = sha1_file($file);
+                $this->data[$file]      = array();
 
                 foreach ($lines as $k => $v) {
                     $this->data[$file][$k] = $v == -2 ? NULL : array();
@@ -546,4 +561,37 @@ protected function processUncoveredFilesFromWhitelist()
 
         $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
     }
+
+    /**
+     * @param  array $checksums
+     * @param  array $data
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    protected function matchPaths(array $checksums, array $data)
+    {
+        $coverageWithLocalPaths = array();
+
+        foreach ($data as $originalRemotePath => $coverage) {
+            $remotePath = $originalRemotePath;
+
+            if (strpos($path, '/') !== FALSE) {
+                $separator = '/';
+            } else {
+                $separator = '\\';
+            }
+
+            while (!($localPath = PHPUnit_Util_Filesystem::fileExistsInIncludePath($remotePath)) &&
+                   strpos($remotePath, $separator) !== FALSE) {
+                $remotePath = substr($remotePath, strpos($remotePath, $separator) + 1);
+            }
+
+            if ($localPath &&
+                sha1_file($localPath) == $checksums[$originalRemotePath]) {
+                $coverageWithLocalPaths[$localPath] = $coverage;
+            }
+        }
+
+        return $coverageWithLocalPaths;
+    }
 }

PHP/CodeCoverage/Report/Node/File.php

@@ -43,10 +43,6 @@
  * @since      File available since Release 1.1.0
  */
 
-if (!defined('T_NAMESPACE')) {
-    define('T_NAMESPACE', 377);
-}
-
 /**
  * Represents a file in the code coverage information tree.
  *

package.xml

@@ -160,6 +160,15 @@
     <channel>components.ez.no</channel>
     <min>1.6</min>
    </package>
+   <extension>
+    <name>dom</name>
+   </extension>
+   <extension>
+    <name>reflection</name>
+   </extension>
+   <extension>
+    <name>spl</name>
+   </extension>
    <extension>
     <name>xdebug</name>
     <min>2.0.5</min>