Merge branch '2.0'

Author: sebastianbergmann

src/CodeCoverage.php

@@ -190,13 +190,15 @@ 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();
         }
 

src/CodeCoverage/Filter.php

@@ -242,6 +242,10 @@ public function isFile($filename)
      */
     public function isFiltered($filename)
     {
+        if (!$this->isFile($filename)) {
+            return true;
+        }
+
         $filename = realpath($filename);
 
         if (!empty($this->whitelistedFiles)) {

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)

tests/PHP/CodeCoverage/FilterTest.php

@@ -300,4 +300,17 @@ public function testNotWhitelistedFileIsFiltered()
         $this->filter->addFileToWhitelist($this->files[0]);
         $this->asserttrue($this->filter->isFiltered($this->files[1]));
     }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFiltered
+     * @covers PHP_CodeCoverage_Filter::isFile
+     */
+    public function testNonFilesAreFiltered()
+    {
+        $this->assertTrue($this->filter->isFiltered('eval()\'d code'));
+        $this->assertTrue($this->filter->isFiltered('runtime-created function'));
+        $this->assertTrue($this->filter->isFiltered('assert code'));
+        $this->assertTrue($this->filter->isFiltered('regexp code'));
+        $this->assertFalse($this->filter->isFiltered('filename'));
+    }
 }