Make PHP_CodeCoverage_Report_Factory::buildDirectoryStructure() and PHP_CodeCoverage_Report_Factory::reducePaths() protected.

Author: sebastianbergmann

PHP/CodeCoverage/Report/Factory.php

@@ -139,9 +139,8 @@ protected function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array
      *
      * @param  array $files
      * @return array
-     * @todo   Need to be made protected.
      */
-    public function buildDirectoryStructure($files)
+    protected function buildDirectoryStructure($files)
     {
         $result = array();
 
@@ -205,9 +204,8 @@ public function buildDirectoryStructure($files)
      *
      * @param  array $files
      * @return string
-     * @todo   Need to be made protected.
      */
-    public function reducePaths(&$files)
+    protected function reducePaths(&$files)
     {
         if (empty($files)) {
             return '.';

Tests/PHP/CodeCoverage/Report/FactoryTest.php

@@ -174,14 +174,21 @@ public function testSomething()
      */
     public function testBuildDirectoryStructure()
     {
+        $method = new ReflectionMethod(
+          'PHP_CodeCoverage_Report_Factory', 'buildDirectoryStructure'
+        );
+
+        $method->setAccessible(TRUE);
+
         $this->assertEquals(
           array(
             'src' => array(
               'Money.php/f' => array(),
               'MoneyBag.php/f' => array()
             )
           ),
-          $this->factory->buildDirectoryStructure(
+          $method->invoke(
+            $this->factory,
             array('src/Money.php' => array(), 'src/MoneyBag.php' => array())
           )
         );
@@ -192,12 +199,18 @@ public function testBuildDirectoryStructure()
      */
     public function testReducePaths()
     {
+        $method = new ReflectionMethod(
+          'PHP_CodeCoverage_Report_Factory', 'reducePaths'
+        );
+
+        $method->setAccessible(TRUE);
+
         $files = array(
           '/home/sb/Money/Money.php'    => array(),
           '/home/sb/Money/MoneyBag.php' => array()
         );
 
-        $commonPath = $this->factory->reducePaths($files);
+        $commonPath = $method->invokeArgs($this->factory, array(&$files));
 
         $this->assertEquals(
           array(
@@ -215,9 +228,15 @@ public function testReducePaths()
      */
     public function testReducePaths2()
     {
+        $method = new ReflectionMethod(
+          'PHP_CodeCoverage_Report_Factory', 'reducePaths'
+        );
+
+        $method->setAccessible(TRUE);
+
         $files = array();
 
-        $commonPath = $this->factory->reducePaths($files);
+        $commonPath = $method->invokeArgs($this->factory, array(&$files));
 
         $this->assertEquals('.', $commonPath);
     }
@@ -227,11 +246,17 @@ public function testReducePaths2()
      */
     public function testReducePaths3()
     {
+        $method = new ReflectionMethod(
+          'PHP_CodeCoverage_Report_Factory', 'reducePaths'
+        );
+
+        $method->setAccessible(TRUE);
+
         $files = array(
           '/home/sb/Money/Money.php' => array()
         );
 
-        $commonPath = $this->factory->reducePaths($files);
+        $commonPath = $method->invokeArgs($this->factory, array(&$files));
 
         $this->assertEquals(
           array(