Merge pull request sebastianbergmann#240 from omigos/2.0

Fix merging of PHP coverage reports

Author: sebastianbergmann

src/CodeCoverage.php

@@ -187,19 +187,21 @@ public function filter()
 
     /**
      * Returns the collected code coverage data.
+     * Set $raw = true to bypass all filters.
      *
+     * @param bool $raw
      * @return array
      * @since  Method available since Release 1.1.0
      */
-    public function getData()
+    public function getData($raw = false)
     {
-        if ($this->addUncoveredFilesFromWhitelist) {
+        if (!$raw && $this->addUncoveredFilesFromWhitelist) {
             $this->addUncoveredFilesFromWhitelist();
         }
 
         // We need to apply the blacklist filter a second time
         // when no whitelist is used.
-        if (!$this->filter->hasWhitelist()) {
+        if (!$raw && !$this->filter->hasWhitelist()) {
             $this->applyListsFilter($this->data);
         }
 

src/CodeCoverage/Report/PHP.php

@@ -77,7 +77,7 @@ public function process(PHP_CodeCoverage $coverage, $target = null)
 $filter->setWhitelistedFiles(%s);
 
 return $coverage;',
-            var_export($coverage->getData(), 1),
+            var_export($coverage->getData(true), 1),
             var_export($coverage->getTests(), 1),
             var_export($filter->getBlacklistedFiles(), 1),
             var_export($filter->getWhitelistedFiles(), 1)