Use PHP_CodeCoverage_Util::getLinesToBeIgnored().

Author: sebastianbergmann

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

@@ -162,6 +162,9 @@ public function __construct($name, PHP_CodeCoverage_Report_HTML_Node $parent = N
         $this->highlight     = $highlight;
         $this->yui           = $yui;
         $this->codeLines     = $this->loadFile($path);
+        $this->ignoredLines  = PHP_CodeCoverage_Util::getLinesToBeIgnored(
+                                 $path
+                               );
 
         $this->calculateStatistics();
     }
@@ -261,22 +264,14 @@ public function render($target, $title, $charset = 'ISO-8859-1', $lowUpperBound
             );
         }
 
-        $i      = 1;
-        $lines  = '';
-        $ignore = FALSE;
+        $i     = 1;
+        $lines = '';
 
         foreach ($this->codeLines as $line) {
-            if (strpos($line, '@codeCoverageIgnoreStart') !== FALSE) {
-                $ignore = TRUE;
-            }
-
-            else if (strpos($line, '@codeCoverageIgnoreEnd') !== FALSE) {
-                $ignore = FALSE;
-            }
-
             $css = '';
 
-            if (!$ignore && isset($this->executedLines[$i])) {
+            if (!isset($this->ignoredLines[$i]) &&
+                 isset($this->executedLines[$i])) {
                 $count = '';
 
                 // Array: Line is executable and was executed.
@@ -517,8 +512,7 @@ protected function calculateStatistics()
         $this->processClasses();
         $this->processFunctions();
 
-        $ignoreStart = -1;
-        $lineNumber  = 1;
+        $lineNumber = 1;
 
         foreach ($this->codeLines as $line) {
             if (isset($this->startLines[$lineNumber])) {
@@ -533,16 +527,6 @@ protected function calculateStatistics()
                 }
             }
 
-            if (strpos($line, '@codeCoverageIgnore') !== FALSE) {
-                if (strpos($line, '@codeCoverageIgnoreStart') !== FALSE) {
-                    $ignoreStart = $lineNumber;
-                }
-
-                else if (strpos($line, '@codeCoverageIgnoreEnd') !== FALSE) {
-                    $ignoreStart = -1;
-                }
-            }
-
             if (isset($this->executedLines[$lineNumber])) {
                 // Array: Line is executable and was executed.
                 if (is_array($this->executedLines[$lineNumber])) {
@@ -572,7 +556,7 @@ protected function calculateStatistics()
 
                     $this->numExecutableLines++;
 
-                    if ($ignoreStart != -1 && $lineNumber > $ignoreStart) {
+                    if (isset($this->ignoredLines[$lineNumber])) {
                         if (isset($currentClass)) {
                             $currentClass['executedLines']++;
                         }