Merge branch '2.0'

Author: sebastianbergmann

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

@@ -62,19 +62,18 @@ class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_R
      */
     public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
     {
-        $classes = $node->getClassesAndTraits();
-        $isRoot  = $node->getParent() === null;
-
+        $classes  = $node->getClassesAndTraits();
         $template = new Text_Template(
             $this->templatePath . 'dashboard.html', '{{', '}}'
         );
 
         $this->setCommonTemplateVariables($template, $node);
 
-        $complexity           = $this->complexity($classes, $isRoot);
-        $coverageDistribution = $this->coverageDistribution($classes, $isRoot);
-        $insufficientCoverage = $this->insufficientCoverage($classes, $isRoot);
-        $projectRisks         = $this->projectRisks($classes, $isRoot);
+        $baseLink             = $node->getId() . '/';
+        $complexity           = $this->complexity($classes, $baseLink);
+        $coverageDistribution = $this->coverageDistribution($classes);
+        $insufficientCoverage = $this->insufficientCoverage($classes, $baseLink);
+        $projectRisks         = $this->projectRisks($classes, $baseLink);
 
         $template->setVar(
             array(
@@ -95,11 +94,11 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
     /**
      * Returns the data for the Class/Method Complexity charts.
      *
-     * @param  array   $classes
-     * @param  boolean $isRoot
+     * @param  array  $classes
+     * @param  string $baseLink
      * @return array
      */
-    protected function complexity(array $classes, $isRoot)
+    protected function complexity(array $classes, $baseLink)
     {
         $result = array('class' => array(), 'method' => array());
 
@@ -114,7 +113,7 @@ protected function complexity(array $classes, $isRoot)
                     $method['ccn'],
                     sprintf(
                         '<a href="%s">%s</a>',
-                        $this->rebaseLink($method['link'], $isRoot),
+                        str_replace($baseLink, '', $method['link']),
                         $methodName
                     )
                 );
@@ -125,7 +124,7 @@ protected function complexity(array $classes, $isRoot)
                 $class['ccn'],
                 sprintf(
                     '<a href="%s">%s</a>',
-                    $this->rebaseLink($class['link'], $isRoot),
+                    str_replace($baseLink, '', $class['link']),
                     $className
                 )
             );
@@ -140,11 +139,10 @@ protected function complexity(array $classes, $isRoot)
     /**
      * Returns the data for the Class / Method Coverage Distribution chart.
      *
-     * @param  array   $classes
-     * @param  boolean $isRoot
+     * @param  array $classes
      * @return array
      */
-    protected function coverageDistribution(array $classes, $isRoot)
+    protected function coverageDistribution(array $classes)
     {
         $result = array(
             'class' => array(
@@ -210,11 +208,11 @@ protected function coverageDistribution(array $classes, $isRoot)
     /**
      * Returns the classes / methods with insufficient coverage.
      *
-     * @param  array   $classes
-     * @param  boolean $isRoot
+     * @param  array  $classes
+     * @param  string $baseLink
      * @return array
      */
-    protected function insufficientCoverage(array $classes, $isRoot)
+    protected function insufficientCoverage(array $classes, $baseLink)
     {
         $leastTestedClasses = array();
         $leastTestedMethods = array();
@@ -244,7 +242,7 @@ protected function insufficientCoverage(array $classes, $isRoot)
         foreach ($leastTestedClasses as $className => $coverage) {
             $result['class'] .= sprintf(
                 '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d%%</td></tr>' . "\n",
-                $this->rebaseLink($classes[$className]['link'], $isRoot),
+                str_replace($baseLink, '', $classes[$className]['link']),
                 $className,
                 $coverage
             );
@@ -255,7 +253,7 @@ protected function insufficientCoverage(array $classes, $isRoot)
 
             $result['method'] .= sprintf(
                 '       <tr><td><a href="%s"><abbr title="%s">%s</a></a></td><td class="text-right">%d%%</td></tr>' . "\n",
-                $this->rebaseLink($classes[$class]['methods'][$method]['link'], $isRoot),
+                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
                 $methodName,
                 $method,
                 $coverage
@@ -268,11 +266,11 @@ protected function insufficientCoverage(array $classes, $isRoot)
     /**
      * Returns the project risks according to the CRAP index.
      *
-     * @param  array   $classes
-     * @param  boolean $isRoot
+     * @param  array  $classes
+     * @param  string $baseLink
      * @return array
      */
-    protected function projectRisks(array $classes, $isRoot)
+    protected function projectRisks(array $classes, $baseLink)
     {
         $classRisks  = array();
         $methodRisks = array();
@@ -304,7 +302,7 @@ protected function projectRisks(array $classes, $isRoot)
         foreach ($classRisks as $className => $crap) {
             $result['class'] .= sprintf(
                 '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d</td></tr>' . "\n",
-                $this->rebaseLink($classes[$className]['link'], $isRoot),
+                str_replace($baseLink, '', $classes[$className]['link']),
                 $className,
                 $crap
             );
@@ -315,7 +313,7 @@ protected function projectRisks(array $classes, $isRoot)
 
             $result['method'] .= sprintf(
                 '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",
-                $this->rebaseLink($classes[$class]['methods'][$method]['link'], $isRoot),
+                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
                 $methodName,
                 $method,
                 $crap
@@ -333,15 +331,4 @@ protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
             $node->getName()
         );
     }
-
-    /**
-     * @param  string  $link
-     * @param  boolean $isRoot
-     * @return string
-     * @since  Method available since Release 2.0.12
-     */
-    private function rebaseLink($link, $isRoot)
-    {
-        return $isRoot ? $link : substr($link, strpos($link, '/') + 1);
-    }
 }