Refactor.

Author: sebastianbergmann

PHP/CodeCoverage/Report/HTML.php

@@ -171,7 +171,7 @@ public function process(PHP_CodeCoverage $coverage, $target)
         $directory->render($report, $target . 'index.html', $this->title);
 
         foreach ($report as $node) {
-            $id = PHP_CodeCoverage_Util::nodeToId($node);
+            $id = $node->getId();
 
             if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
                 $dashboard->render($node, $target . $id . '.dashboard.html');

PHP/CodeCoverage/Report/HTML/Renderer.php

@@ -123,7 +123,7 @@ protected function setCommonTemplateVariables(Text_Template $template, $title, P
                 $link .= sprintf(
                   '%s<a href="%s.html">%s</a>',
                   !empty($link) ? ' / ' : '',
-                  PHP_CodeCoverage_Util::nodeToId($step),
+                  $step->getId(),
                   $step->getName()
                 );
             }

PHP/CodeCoverage/Report/HTML/Renderer/Directory.php

@@ -84,7 +84,7 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file, $tit
 
         $template->setVar(
           array(
-            'id'    => PHP_CodeCoverage_Util::nodeToId($node),
+            'id'    => $node->getId(),
             'items' => $items
           )
         );
@@ -110,7 +110,7 @@ protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = FALSE
         } else {
             $name = sprintf(
               '<a href="%s.html">%s</a>',
-              PHP_CodeCoverage_Util::nodeToId($item),
+              $item->getId(),
               $item->getName()
             );
 

PHP/CodeCoverage/Report/Node.php

@@ -77,6 +77,11 @@ abstract class PHP_CodeCoverage_Report_Node implements Countable
      */
     protected $parent;
 
+    /**
+     * @var string
+     */
+    protected $id;
+
     /**
      * Constructor.
      *
@@ -101,6 +106,30 @@ public function getName()
         return $this->name;
     }
 
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        if ($this->id === NULL) {
+            $parent = $this->getParent();
+
+            if ($parent === NULL) {
+                $this->id = 'index';
+            } else {
+                $parentId = $parent->getId();
+
+                if ($parentId == 'index') {
+                    $this->id = $this->name;
+                } else {
+                    $this->id = $parentId . '_' . $this->name;
+                }
+            }
+        }
+
+        return $this->id;
+    }
+
     /**
      * @return string
      */

PHP/CodeCoverage/Report/Node/File.php

@@ -485,7 +485,7 @@ protected function processClasses(PHP_Token_Stream $tokens)
         $classes = $tokens->getClasses();
         unset($tokens);
 
-        $link = PHP_CodeCoverage_Util::nodeToId($this) . '.html#';
+        $link = $this->getId() . '.html#';
 
         foreach ($classes as $className => $class) {
             $this->classes[$className] = array(

PHP/CodeCoverage/Util.php

@@ -469,32 +469,6 @@ public static function reducePaths(&$files)
         return substr($commonPath, 0, -1);
     }
 
-    /**
-     * @param  PHP_CodeCoverage_Report_Node $node
-     * @return string
-     */
-    public static function nodeToId(PHP_CodeCoverage_Report_Node $node)
-    {
-        if (!isset(self::$ids[$node->getPath()])) {
-            $parent = $node->getParent();
-
-            if ($parent === NULL) {
-                self::$ids[$node->getPath()] = 'index';
-            } else {
-                $parentId = self::nodeToId($parent);
-
-                if ($parentId == 'index') {
-                    self::$ids[$node->getPath()] = $node->getName();
-                } else {
-                    self::$ids[$node->getPath()] = $parentId . '_' .
-                                                   $node->getName();
-                }
-            }
-        }
-
-        return self::$ids[$node->getPath()];
-    }
-
     /**
      * @param  string $coveredElement
      * @return array