Merge branch 'master' into refactoring/preparation-for-branch-path-opcode-coverage

Author: sebastianbergmann

src/CodeCoverage/Driver.php

@@ -140,7 +140,7 @@ protected function cleanup(array &$data)
     private function filter(array &$data)
     {
         foreach (array_keys($data) as $filename) {
-            if ($this->filter->isFiltered($filename)) {
+            if (!file_exists($filename) || $this->filter->isFiltered($filename)) {
                 unset($data[$filename]);
                 continue;
             }

src/CodeCoverage/Filter.php

@@ -219,6 +219,8 @@ 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 ||
             strpos($filename, 'runkit created function') !== false ||

src/CodeCoverage/Report/HTML/Renderer/Dashboard.php

@@ -249,9 +249,10 @@ protected function insufficientCoverage(array $classes)
             list($class, $method) = explode('::', $methodName);
 
             $result['method'] .= sprintf(
-                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d%%</td></tr>' . "\n",
+                '       <tr><td><a href="%s"><abbr title="%s">%s</a></a></td><td class="text-right">%d%%</td></tr>' . "\n",
                 $classes[$class]['methods'][$method]['link'],
                 $methodName,
+                $method,
                 $coverage
             );
         }
@@ -307,9 +308,10 @@ protected function projectRisks(array $classes)
             list($class, $method) = explode('::', $methodName);
 
             $result['method'] .= sprintf(
-                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d</td></tr>' . "\n",
+                '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",
                 $classes[$class]['methods'][$method]['link'],
                 $methodName,
+                $method,
                 $crap
             );
         }

tests/PHP/CodeCoverage/FilterTest.php

@@ -267,11 +267,13 @@ public function testRemovingADirectoryFromTheWhitelistWorks()
      */
     public function testIsFile()
     {
-        $this->assertfalse($this->filter->isFile('eval()\'d code'));
-        $this->assertfalse($this->filter->isFile('runtime-created function'));
-        $this->assertfalse($this->filter->isFile('assert code'));
-        $this->assertfalse($this->filter->isFile('regexp code'));
-        $this->asserttrue($this->filter->isFile('filename'));
+        $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'));
+        $this->assertFalse($this->filter->isFile('regexp code'));
+        $this->assertTrue($this->filter->isFile('filename'));
     }
 
     /**
@@ -280,7 +282,7 @@ public function testIsFile()
     public function testBlacklistedFileIsFiltered()
     {
         $this->filter->addFileToBlacklist($this->files[0]);
-        $this->asserttrue($this->filter->isFiltered($this->files[0]));
+        $this->assertTrue($this->filter->isFiltered($this->files[0]));
     }
 
     /**
@@ -289,7 +291,7 @@ public function testBlacklistedFileIsFiltered()
     public function testWhitelistedFileIsNotFiltered()
     {
         $this->filter->addFileToWhitelist($this->files[0]);
-        $this->assertfalse($this->filter->isFiltered($this->files[0]));
+        $this->assertFalse($this->filter->isFiltered($this->files[0]));
     }
 
     /**
@@ -298,7 +300,7 @@ public function testWhitelistedFileIsNotFiltered()
     public function testNotWhitelistedFileIsFiltered()
     {
         $this->filter->addFileToWhitelist($this->files[0]);
-        $this->asserttrue($this->filter->isFiltered($this->files[1]));
+        $this->assertTrue($this->filter->isFiltered($this->files[1]));
     }
 
     /**
@@ -307,6 +309,8 @@ 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'));
         $this->assertTrue($this->filter->isFiltered('assert code'));

tests/PHP/CodeCoverage/Report/FactoryTest.php

@@ -93,7 +93,7 @@ public function testSomething()
         $this->assertEquals('50.00%', $root->getLineExecutedPercent());
         $this->assertEquals(0, $root->getNumFunctions());
         $this->assertEquals(0, $root->getNumTestedFunctions());
-        $this->assertnull($root->getParent());
+        $this->assertNull($root->getParent());
         $this->assertEquals(array(), $root->getDirectories());
         #$this->assertEquals(array(), $root->getFiles());
         #$this->assertEquals(array(), $root->getChildNodes());