Merge branch '1.3'

Author: sebastianbergmann

src/CodeCoverage/Report/HTML.php

@@ -76,24 +76,17 @@ class PHP_CodeCoverage_Report_HTML
      */
     private $highLowerBound;
 
-    /**
-     * @var boolean
-     */
-    private $highlight;
-
     /**
      * Constructor.
      *
-     * @param boolean $highlight
      * @param integer $lowUpperBound
      * @param integer $highLowerBound
      * @param string  $generator
      */
-    public function __construct($highlight = true, $lowUpperBound = 50, $highLowerBound = 90, $generator = '')
+    public function __construct($lowUpperBound = 50, $highLowerBound = 90, $generator = '')
     {
         $this->generator      = $generator;
         $this->highLowerBound = $highLowerBound;
-        $this->highlight      = $highlight;
         $this->lowUpperBound  = $lowUpperBound;
 
         $this->templatePath = sprintf(
@@ -144,8 +137,7 @@ public function process(PHP_CodeCoverage $coverage, $target)
             $this->generator,
             $date,
             $this->lowUpperBound,
-            $this->highLowerBound,
-            $this->highlight
+            $this->highLowerBound
         );
 
         $directory->render($report, $target . 'index.html');

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

@@ -56,11 +56,6 @@
  */
 class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
 {
-    /**
-     * @var boolean
-     */
-    protected $highlight;
-
     /**
      * Constructor.
      *
@@ -69,9 +64,8 @@ class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report
      * @param string  $date
      * @param integer $lowUpperBound
      * @param integer $highLowerBound
-     * @param boolean $highlight
      */
-    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound, $highlight)
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
     {
         parent::__construct(
             $templatePath,
@@ -80,8 +74,6 @@ public function __construct($templatePath, $generator, $date, $lowUpperBound, $h
             $lowUpperBound,
             $highLowerBound
         );
-
-        $this->highlight = $highlight;
     }
 
     /**
@@ -394,7 +386,7 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
                 $i,
                 $i,
                 $i,
-                !$this->highlight ? htmlspecialchars($line) : $line
+                $line
             );
 
             $i++;
@@ -409,26 +401,10 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
      */
     protected function loadFile($file)
     {
-        $buffer = file_get_contents($file);
-        $lines  = explode("\n", str_replace("\t", '    ', $buffer));
-        $result = array();
-
-        if (count($lines) == 0) {
-            return $result;
-        }
-
-        $lines = array_map('rtrim', $lines);
-
-        if (!$this->highlight) {
-            unset($lines[count($lines)-1]);
-
-            return $lines;
-        }
-
-        $tokens     = token_get_all($buffer);
-        $stringFlag = false;
+        $tokens     = token_get_all(file_get_contents($file));
+        $result     = array('');
         $i          = 0;
-        $result[$i] = '';
+        $stringFlag = false;
 
         foreach ($tokens as $j => $token) {
             if (is_string($token)) {