Refactor.

Author: sebastianbergmann

PHP/CodeCoverage/Report/HTML.php

@@ -136,7 +136,12 @@ public function process(PHP_CodeCoverage $coverage, $target)
         $date = date('D M j G:i:s T Y', $_SERVER['REQUEST_TIME']);
 
         $dashboard = new PHP_CodeCoverage_Report_HTML_Renderer_Dashboard(
-          $this->templatePath, $this->charset, $this->generator, $date
+          $this->templatePath,
+          $this->charset,
+          $this->generator,
+          $date,
+          $this->lowUpperBound,
+          $this->highLowerBound
         );
 
         $directory = new PHP_CodeCoverage_Report_HTML_Renderer_Directory(

PHP/CodeCoverage/Report/HTML/Renderer.php

@@ -77,20 +77,34 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
      */
     protected $date;
 
+    /**
+     * @var integer
+     */
+    protected $lowUpperBound;
+
+    /**
+     * @var integer
+     */
+    protected $highLowerBound;
+
     /**
      * Constructor.
      *
      * @param string  $templatePath
      * @param string  $charset
      * @param string  $generator
      * @param string  $date
+     * @param integer $lowUpperBound
+     * @param integer $highLowerBound
      */
-    public function __construct($templatePath, $charset, $generator, $date)
+    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound)
     {
-        $this->templatePath = $templatePath;
-        $this->charset      = $charset;
-        $this->generator    = $generator;
-        $this->date         = $date;
+        $this->templatePath   = $templatePath;
+        $this->charset        = $charset;
+        $this->generator      = $generator;
+        $this->date           = $date;
+        $this->lowUpperBound  = $lowUpperBound;
+        $this->highLowerBound = $highLowerBound;
     }
 
     /**
@@ -100,12 +114,14 @@ protected function setCommonTemplateVariables(Text_Template $template, $title)
     {
         $template->setVar(
           array(
-            'title'       => $title,
-            'charset'     => $this->charset,
-            'date'        => $this->date,
-            'version'     => '@package_version@',
-            'php_version' => PHP_VERSION,
-            'generator'   => $this->generator
+            'title'            => $title,
+            'charset'          => $this->charset,
+            'date'             => $this->date,
+            'version'          => '@package_version@',
+            'php_version'      => PHP_VERSION,
+            'generator'        => $this->generator,
+            'low_upper_bound'  => $this->lowUpperBound,
+            'high_lower_bound' => $this->highLowerBound
           )
         );
     }

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

@@ -57,34 +57,6 @@
  */
 class PHP_CodeCoverage_Report_HTML_Renderer_Directory extends PHP_CodeCoverage_Report_HTML_Renderer
 {
-    /**
-     * @var integer
-     */
-    protected $lowUpperBound;
-
-    /**
-     * @var integer
-     */
-    protected $highLowerBound;
-
-    /**
-     * Constructor.
-     *
-     * @param string  $templatePath
-     * @param string  $charset
-     * @param string  $generator
-     * @param string  $date
-     * @param integer $lowUpperBound
-     * @param integer $highLowerBound
-     */
-    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound)
-    {
-        parent::__construct($templatePath, $charset, $generator, $date);
-
-        $this->lowUpperBound  = $lowUpperBound;
-        $this->highLowerBound = $highLowerBound;
-    }
-
     /**
      * @param PHP_CodeCoverage_Report_Node_Directory $node
      * @param string                                 $file
@@ -100,13 +72,6 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file, $tit
 
         $this->setCommonTemplateVariables($template, $title);
 
-        $template->setVar(
-          array(
-            'low_upper_bound'  => $this->lowUpperBound,
-            'high_lower_bound' => $this->highLowerBound
-          )
-        );
-
         $template->renderTo($file);
     }
 }

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

@@ -57,16 +57,6 @@
  */
 class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
 {
-    /**
-     * @var integer
-     */
-    protected $lowUpperBound;
-
-    /**
-     * @var integer
-     */
-    protected $highLowerBound;
-
     /**
      * @var boolean
      */
@@ -91,12 +81,17 @@ class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report
      */
     public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound, $highlight, $yui)
     {
-        parent::__construct($templatePath, $charset, $generator, $date);
+        parent::__construct(
+          $templatePath,
+          $charset,
+          $generator,
+          $date,
+          $lowUpperBound,
+          $highLowerBound
+        );
 
-        $this->lowUpperBound  = $lowUpperBound;
-        $this->highLowerBound = $highLowerBound;
-        $this->highlight      = $highlight;
-        $this->yui            = $yui;
+        $this->highlight = $highlight;
+        $this->yui       = $yui;
     }
 
     /**