Merge branch '2.0'

Author: whatthejeff

src/CodeCoverage/Filter.php

@@ -219,6 +219,7 @@ public function removeFileFromWhitelist($filename)
     public function isFile($filename)
     {
         if ($filename == '-' ||
+            strpos($filename, 'vfs://') === 0 ||
             strpos($filename, 'xdebug://debug-eval') !== false ||
             strpos($filename, 'eval()\'d code') !== false ||
             strpos($filename, 'runtime-created function') !== false ||

tests/PHP/CodeCoverage/FilterTest.php

@@ -267,6 +267,8 @@ public function testRemovingADirectoryFromTheWhitelistWorks()
      */
     public function testIsFile()
     {
+        $this->assertFalse($this->filter->isFile('vfs://root/a/path'));
+        $this->assertFalse($this->filter->isFile('xdebug://debug-eval'));
         $this->assertfalse($this->filter->isFile('eval()\'d code'));
         $this->assertfalse($this->filter->isFile('runtime-created function'));
         $this->assertfalse($this->filter->isFile('assert code'));
@@ -307,6 +309,7 @@ public function testNotWhitelistedFileIsFiltered()
      */
     public function testNonFilesAreFiltered()
     {
+        $this->assertTrue($this->filter->isFiltered('vfs://root/a/path'));
         $this->assertTrue($this->filter->isFiltered('xdebug://debug-eval'));
         $this->assertTrue($this->filter->isFiltered('eval()\'d code'));
         $this->assertTrue($this->filter->isFiltered('runtime-created function'));