Refactor.

Author: sebastianbergmann

PHP/CodeCoverage/Report/HTML.php

@@ -63,46 +63,54 @@ class PHP_CodeCoverage_Report_HTML
     protected $templatePath;
 
     /**
-     * @var array
+     * @var string
      */
-    protected $options;
+    protected $charset;
 
     /**
-     * Constructor.
-     *
-     * @param array $options
+     * @var string
      */
-    public function __construct(array $options = array())
-    {
-        if (!isset($options['title'])) {
-            $options['title'] = '';
-        }
-
-        if (!isset($options['charset'])) {
-            $options['charset'] = 'UTF-8';
-        }
+    protected $generator;
 
-        if (!isset($options['yui'])) {
-            $options['yui'] = TRUE;
-        }
+    /**
+     * @var integer
+     */
+    protected $lowUpperBound;
 
-        if (!isset($options['highlight'])) {
-            $options['highlight'] = FALSE;
-        }
+    /**
+     * @var integer
+     */
+    protected $highLowerBound;
 
-        if (!isset($options['lowUpperBound'])) {
-            $options['lowUpperBound'] = 35;
-        }
+    /**
+     * @var boolean
+     */
+    protected $highlight;
 
-        if (!isset($options['highLowerBound'])) {
-            $options['highLowerBound'] = 70;
-        }
+    /**
+     * @var string
+     */
+    protected $title;
 
-        if (!isset($options['generator'])) {
-            $options['generator'] = '';
-        }
+    /**
+     * @var boolean
+     */
+    protected $yui;
 
-        $this->options = $options;
+    /**
+     * Constructor.
+     *
+     * @param array $options
+     */
+    public function __construct($title = '', $charset = 'UTF-8', $yui = TRUE, $highlight = FALSE, $lowUpperBound = 35, $highLowerBound = 70, $generator = '')
+    {
+        $this->charset        = $charset;
+        $this->generator      = $generator;
+        $this->highLowerBound = $highLowerBound;
+        $this->highlight      = $highlight;
+        $this->lowUpperBound  = $lowUpperBound;
+        $this->title          = $title;
+        $this->yui            = $yui;
 
         $this->templatePath = sprintf(
           '%s%sHTML%sTemplate%s',
@@ -125,31 +133,29 @@ public function process(PHP_CodeCoverage $coverage, $target)
         unset($coverage);
 
         $dashboard = new PHP_CodeCoverage_Report_HTML_Dashboard(
-          $this->templatePath,
-          $this->options['charset'],
-          $this->options['generator']
+          $this->templatePath, $this->charset, $this->generator
         );
 
         $directory = new PHP_CodeCoverage_Report_HTML_Directory(
           $this->templatePath,
-          $this->options['charset'],
-          $this->options['generator'],
-          $this->options['lowUpperBound'],
-          $this->options['highLowerBound']
+          $this->charset,
+          $this->generator,
+          $this->lowUpperBound,
+          $this->highLowerBound
         );
 
         $file = new PHP_CodeCoverage_Report_HTML_File(
           $this->templatePath,
-          $this->options['charset'],
-          $this->options['generator'],
-          $this->options['lowUpperBound'],
-          $this->options['highLowerBound'],
-          $this->options['highlight'],
-          $this->options['yui']
+          $this->charset,
+          $this->generator,
+          $this->lowUpperBound,
+          $this->highLowerBound,
+          $this->highlight,
+          $this->yui
         );
 
         $dashboard->render(
-          $report, $target . 'index.dashboard.html', $this->options['title']
+          $report, $target . 'index.dashboard.html', $this->title
         );
 
         foreach ($report as $node) {