Refactor.

Author: sebastianbergmann

PHP/CodeCoverage/Report/Factory.php

@@ -65,14 +65,13 @@ public static function create(PHP_CodeCoverage $coverage)
         $files      = $coverage->getData();
         $commonPath = PHP_CodeCoverage_Util::reducePaths($files);
         $root       = new PHP_CodeCoverage_Report_Node_Directory(
-                        $commonPath, $commonPath, NULL
+                        $commonPath, NULL
                       );
 
         self::addItems(
           $root,
           PHP_CodeCoverage_Util::buildDirectoryStructure($files),
-          $coverage->getTests(),
-          $commonPath
+          $coverage->getTests()
         );
 
         return $root;
@@ -82,17 +81,16 @@ public static function create(PHP_CodeCoverage $coverage)
      * @param PHP_CodeCoverage_Report_Node_Directory $root
      * @param array                                  $items
      * @param array                                  $tests
-     * @param string                                 $commonPath
      */
-    protected static function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $commonPath)
+    protected static function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests)
     {
         foreach ($items as $key => $value) {
             if (substr($key, -2) == '/f') {
                 $key = substr($key, 0, -2);
-                $root->addFile($key, $commonPath . $key, $value, $tests);
+                $root->addFile($key, $value, $tests);
             } else {
-                $child = $root->addDirectory($key, $commonPath . $key);
-                self::addItems($child, $value, $tests, $commonPath);
+                $child = $root->addDirectory($key);
+                self::addItems($child, $value, $tests);
             }
         }
     }

PHP/CodeCoverage/Report/Node.php

@@ -76,13 +76,11 @@ abstract class PHP_CodeCoverage_Report_Node implements Countable
      * Constructor.
      *
      * @param string                       $name
-     * @param string                       $path
      * @param PHP_CodeCoverage_Report_Node $parent
      */
-    public function __construct($name, $path, PHP_CodeCoverage_Report_Node $parent = NULL)
+    public function __construct($name, PHP_CodeCoverage_Report_Node $parent = NULL)
     {
         $this->name   = $name;
-        $this->path   = $path;
         $this->parent = $parent;
     }
 
@@ -99,6 +97,14 @@ public function getName()
      */
     public function getPath()
     {
+        if ($this->path === NULL) {
+            if ($this->parent === NULL) {
+                $this->path = $this->name;
+            } else {
+                $this->path = $this->parent->getPath() . '/' . $this->name;
+            }
+        }
+
         return $this->path;
     }
 

PHP/CodeCoverage/Report/Node/Directory.php

@@ -182,14 +182,11 @@ public function getIterator()
      * Adds a new directory.
      *
      * @param  string $name
-     * @param  string $path
      * @return PHP_CodeCoverage_Report_Node_Directory
      */
-    public function addDirectory($name, $path)
+    public function addDirectory($name)
     {
-        $directory = new PHP_CodeCoverage_Report_Node_Directory(
-          $name, $path, $this
-        );
+        $directory = new PHP_CodeCoverage_Report_Node_Directory($name, $this);
 
         $this->children[]    = $directory;
         $this->directories[] = &$this->children[count($this->children) - 1];
@@ -201,16 +198,15 @@ public function addDirectory($name, $path)
      * Adds a new file.
      *
      * @param  string $name
-     * @param  string $path
      * @param  array  $coverageData
      * @param  array  $testData
      * @return PHP_CodeCoverage_Report_Node_File
      * @throws RuntimeException
      */
-    public function addFile($name, $path, array $coverageData, array $testData)
+    public function addFile($name, array $coverageData, array $testData)
     {
         $file = new PHP_CodeCoverage_Report_Node_File(
-          $name, $path, $this, $coverageData, $testData
+          $name, $this, $coverageData, $testData
         );
 
         $this->children[] = $file;

PHP/CodeCoverage/Report/Node/File.php

@@ -61,11 +61,6 @@
  */
 class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
 {
-    /**
-     * @var string
-     */
-    protected $path;
-
     /**
      * @var array
      */
@@ -145,19 +140,18 @@ class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
      * Constructor.
      *
      * @param  string                       $name
-     * @param  string                       $path
      * @param  PHP_CodeCoverage_Report_Node $parent
      * @param  array                        $coverageData
      * @param  array                        $testData
      */
-    public function __construct($name, $path, PHP_CodeCoverage_Report_Node $parent, array $coverageData, array $testData)
+    public function __construct($name, PHP_CodeCoverage_Report_Node $parent, array $coverageData, array $testData)
     {
-        parent::__construct($name, $path, $parent);
+        parent::__construct($name, $parent);
 
         $this->coverageData = $coverageData;
         $this->testData     = $testData;
         $this->ignoredLines = PHP_CodeCoverage_Util::getLinesToBeIgnored(
-                                $path
+                                $this->getPath()
                               );
 
         $this->calculateStatistics();

PHP/CodeCoverage/Util.php

@@ -473,7 +473,7 @@ public static function reducePaths(&$files)
 
         ksort($files);
 
-        return $commonPath;
+        return substr($commonPath, 0, -1);
     }
 
     /**

Tests/PHP/CodeCoverage/UtilTest.php

@@ -273,7 +273,7 @@ public function testReducePaths()
           $files
         );
 
-        $this->assertEquals('/home/sb/Money/', $commonPath);
+        $this->assertEquals('/home/sb/Money', $commonPath);
     }
 
     /**