Refactor the report generation.

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -163,6 +163,20 @@ function_exists('php_timer_autoload')) {
         $this->filter->addFilesToBlacklist(text_template_autoload());
     }
 
+    /**
+     * Returns the PHP_CodeCoverage_Report_Node_* object graph
+     * for this PHP_CodeCoverage object.
+     *
+     * @return PHP_CodeCoverage_Report_Node_Directory
+     * @since  Method available since Release 1.1.0
+     */
+    public function getReport()
+    {
+        $factory = new PHP_CodeCoverage_Report_Factory;
+
+        return $factory->create($this);
+    }
+
     /**
      * Clears collected code coverage data.
      */
@@ -355,7 +369,8 @@ public function setCacheTokens($flag)
     }
 
     /**
-     * @return boolean
+     * @param  boolean $flag
+     * @throws InvalidArgumentException
      * @since  Method available since Release 1.1.0
      */
     public function getCacheTokens()
@@ -445,13 +460,7 @@ protected function applyCoversAnnotationFilter(&$data, $id)
         }
 
         else if ($this->forceCoversAnnotation) {
-            if ($this->processUncoveredFilesFromWhitelist) {
-                foreach (array_keys($data) as $filename) {
-                    $data[$filename] = array();
-                }
-            } else {
-                $data = array();
-            }
+            $data = array();
         }
     }
 

PHP/CodeCoverage/Autoload.php

@@ -59,11 +59,16 @@ function php_codecoverage_autoload($class = NULL) {
           'php_codecoverage_exception' => '/CodeCoverage/Exception.php',
           'php_codecoverage_filter' => '/CodeCoverage/Filter.php',
           'php_codecoverage_report_clover' => '/CodeCoverage/Report/Clover.php',
+          'php_codecoverage_report_factory' => '/CodeCoverage/Report/Factory.php',
           'php_codecoverage_report_html' => '/CodeCoverage/Report/HTML.php',
-          'php_codecoverage_report_html_node' => '/CodeCoverage/Report/HTML/Node.php',
-          'php_codecoverage_report_html_node_directory' => '/CodeCoverage/Report/HTML/Node/Directory.php',
-          'php_codecoverage_report_html_node_file' => '/CodeCoverage/Report/HTML/Node/File.php',
-          'php_codecoverage_report_html_node_iterator' => '/CodeCoverage/Report/HTML/Node/Iterator.php',
+          'php_codecoverage_report_html_renderer' => '/CodeCoverage/Report/HTML/Renderer.php',
+          'php_codecoverage_report_html_renderer_dashboard' => '/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
+          'php_codecoverage_report_html_renderer_directory' => '/CodeCoverage/Report/HTML/Renderer/Directory.php',
+          'php_codecoverage_report_html_renderer_file' => '/CodeCoverage/Report/HTML/Renderer/File.php',
+          'php_codecoverage_report_node' => '/CodeCoverage/Report/Node.php',
+          'php_codecoverage_report_node_directory' => '/CodeCoverage/Report/Node/Directory.php',
+          'php_codecoverage_report_node_file' => '/CodeCoverage/Report/Node/File.php',
+          'php_codecoverage_report_node_iterator' => '/CodeCoverage/Report/Node/Iterator.php',
           'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
           'php_codecoverage_textui_command' => '/CodeCoverage/TextUI/Command.php',
           'php_codecoverage_util' => '/CodeCoverage/Util.php'