Merge branch '1.3'

Author: sebastianbergmann

src/CodeCoverage/Report/HTML.php

@@ -61,11 +61,6 @@ class PHP_CodeCoverage_Report_HTML
      */
     private $templatePath;
 
-    /**
-     * @var string
-     */
-    private $charset;
-
     /**
      * @var string
      */
@@ -89,11 +84,13 @@ class PHP_CodeCoverage_Report_HTML
     /**
      * Constructor.
      *
-     * @param array $options
+     * @param boolean $highlight
+     * @param integer $lowUpperBound
+     * @param integer $highLowerBound
+     * @param string  $generator
      */
-    public function __construct($charset = 'UTF-8', $highlight = false, $lowUpperBound = 50, $highLowerBound = 90, $generator = '')
+    public function __construct($highlight = true, $lowUpperBound = 50, $highLowerBound = 90, $generator = '')
     {
-        $this->charset        = $charset;
         $this->generator      = $generator;
         $this->highLowerBound = $highLowerBound;
         $this->highlight      = $highlight;
@@ -128,7 +125,6 @@ public function process(PHP_CodeCoverage $coverage, $target)
 
         $dashboard = new PHP_CodeCoverage_Report_HTML_Renderer_Dashboard(
             $this->templatePath,
-            $this->charset,
             $this->generator,
             $date,
             $this->lowUpperBound,
@@ -137,7 +133,6 @@ public function process(PHP_CodeCoverage $coverage, $target)
 
         $directory = new PHP_CodeCoverage_Report_HTML_Renderer_Directory(
             $this->templatePath,
-            $this->charset,
             $this->generator,
             $date,
             $this->lowUpperBound,
@@ -146,7 +141,6 @@ public function process(PHP_CodeCoverage $coverage, $target)
 
         $file = new PHP_CodeCoverage_Report_HTML_Renderer_File(
             $this->templatePath,
-            $this->charset,
             $this->generator,
             $date,
             $this->lowUpperBound,

src/CodeCoverage/Report/HTML/Renderer.php

@@ -63,11 +63,6 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
      */
     protected $templatePath;
 
-    /**
-     * @var string
-     */
-    protected $charset;
-
     /**
      * @var string
      */
@@ -97,18 +92,16 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
      * 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)
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
     {
         $version = new SebastianBergmann\Version('1.4', __DIR__);
 
         $this->templatePath   = $templatePath;
-        $this->charset        = $charset;
         $this->generator      = $generator;
         $this->date           = $date;
         $this->lowUpperBound  = $lowUpperBound;
@@ -206,7 +199,6 @@ protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeC
                 'full_path'        => $node->getPath(),
                 'path_to_root'     => $this->getPathToRoot($node),
                 'breadcrumbs'      => $this->getBreadcrumbs($node),
-                'charset'          => $this->charset,
                 'date'             => $this->date,
                 'version'          => $this->version,
                 'runtime_name'     => $runtime->getRuntimeName(),

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

@@ -65,18 +65,16 @@ class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report
      * Constructor.
      *
      * @param string  $templatePath
-     * @param string  $charset
      * @param string  $generator
      * @param string  $date
      * @param integer $lowUpperBound
      * @param integer $highLowerBound
      * @param boolean $highlight
      */
-    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound, $highlight)
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound, $highlight)
     {
         parent::__construct(
             $templatePath,
-            $charset,
             $generator,
             $date,
             $lowUpperBound,

src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-  <meta charset="{{charset}}">
+  <meta charset="UTF-8">
   <title>Dashboard for {{full_path}}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">

src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-  <meta charset="{{charset}}">
+  <meta charset="UTF-8">
   <title>Code Coverage for {{full_path}}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">

src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-  <meta charset="{{charset}}">
+  <meta charset="UTF-8">
   <title>Code Coverage for {{full_path}}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">