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

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/Factory.php

@@ -277,6 +277,28 @@ private function reducePaths(&$files)
 
         ksort($files);
 
-        return substr($commonPath, 0, -1);
+        return $this->removeTailingDirectorySeparator($commonPath);
+    }
+
+    /**
+     * @param $commonPath
+     * @return bool
+     */
+    private function isNotRoot($commonPath)
+    {
+        return strlen($commonPath) > 1;
+    }
+
+    /**
+     * @param $commonPath
+     * @return string
+     */
+    private function removeTailingDirectorySeparator($commonPath)
+    {
+        if ($this->isNotRoot($commonPath)) {
+            $commonPath = substr($commonPath, 0, -1);
+            return $commonPath;
+        }
+        return $commonPath;
     }
 }

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

@@ -83,8 +83,7 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
                 'complexity_class'              => $complexity['class'],
                 'complexity_method'             => $complexity['method'],
                 'class_coverage_distribution'   => $coverageDistribution['class'],
-                'method_coverage_distribution'  => $coverageDistribution['method'],
-                'backlink'                      => basename(str_replace('.dashboard', '', $file))
+                'method_coverage_distribution'  => $coverageDistribution['method']
             )
         );
 
@@ -325,9 +324,8 @@ protected function projectRisks(array $classes)
     protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
     {
         return sprintf(
-            '        <li><a href="%s.html">%s</a></li>' . "\n" .
+            '        <li><a href="index.html">%s</a></li>' . "\n" .
             '        <li class="active">(Dashboard)</li>' . "\n",
-            $node->getId(),
             $node->getName()
         );
     }

src/CodeCoverage/Report/Node.php

@@ -89,7 +89,7 @@ abstract class PHP_CodeCoverage_Report_Node implements Countable
      */
     public function __construct($name, PHP_CodeCoverage_Report_Node $parent = null)
     {
-        if (substr($name, -1) == '/') {
+        if ($this->hasTailingSlashAndIsNotRoot($name)) {
             $name = substr($name, 0, -1);
         }
 
@@ -377,4 +377,13 @@ abstract public function getNumFunctions();
      * @return integer
      */
     abstract public function getNumTestedFunctions();
+
+    /**
+     * @param $name
+     * @return bool
+     */
+    private function hasTailingSlashAndIsNotRoot($name)
+    {
+        return substr($name, -1) == '/' && strlen($name) > 1;
+    }
 }

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'));
+    }
 }

tests/PHP/CodeCoverage/Report/FactoryTest.php

@@ -231,6 +231,17 @@ public function reducePathsProvider()
               '/home/sb/Money/MoneyBag.php' => array()
             )
           ),
+          array(
+            array(
+              'driveA/Money.php' => array(),
+              'driveB/MoneyBag.php' => array()
+            ),
+            '/',
+            array(
+              '/driveA/Money.php' => array(),
+              '/driveB/MoneyBag.php' => array()
+            )
+          ),
           array(
             array(
               'Money.php' => array()

tests/PHP/CodeCoverage/Report/NodeTest.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <[email protected]>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <[email protected]>
+ * @copyright  2009-2014 Sebastian Bergmann <[email protected]>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ */
+
+/**
+ * Tests for the PHP_CodeCoverage_Report_Node class.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <[email protected]>
+ * @copyright  2009-2014 Sebastian Bergmann <[email protected]>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ */
+class PHP_CodeCoverage_Report_NodeTest extends PHPUnit_Framework_TestCase
+{
+    public function testTrimsTailingSlashes()
+    {
+        $node = $this->getInstance('/SomeName.php/');
+        $this->assertEquals('/SomeName.php', $node->getPath());
+    }
+
+    public function testNodeAcceptsRootScope()
+    {
+        $node = $this->getInstance('/');
+        $this->assertEquals('/', $node->getPath());
+    }
+
+    /**
+     * @param $path
+     * @return PHP_CodeCoverage_Report_Node
+     */
+    private function getInstance($path)
+    {
+        $builder = $this->getMockBuilder('PHP_CodeCoverage_Report_Node')
+            ->setConstructorArgs(array($path));
+
+        $this->mockMethods($builder);
+        return $builder->getMock();
+    }
+
+    /**
+     * @param $builder
+     */
+    private function mockMethods($builder)
+    {
+        $reflectionClass = new \ReflectionClass('PHP_CodeCoverage_Report_Node');
+        $methods = array();
+        foreach ($reflectionClass->getMethods() as $method) {
+            if ($method->isAbstract()) {
+                $methods[] = $method->getName();
+            }
+        }
+        $builder->setMethods($methods);
+    }
+}