handle the codeCoverageIgnore checks before handling the comment token;

don't ignore a comment line if there appears to be
other code in front of it on the same line;

Author: ashnazg

PHP/CodeCoverage/Util.php

@@ -114,25 +114,9 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
                 switch (get_class($token)) {
                     case 'PHP_Token_COMMENT':
                     case 'PHP_Token_DOC_COMMENT': {
-                        $count = substr_count($token, "\n");
-                        $line  = $token->getLine();
-
-                        for ($i = $line; $i < $line + $count; $i++) {
-                            self::$ignoredLines[$filename][$i] = TRUE;
-                        }
-
-                        if ($token instanceof PHP_Token_DOC_COMMENT) {
-                            // Workaround for the fact the DOC_COMMENT token
-                            // does not include the final \n character in its
-                            // text.
-                            if (substr(trim($lines[$i-1]), -2) == '*/') {
-                                self::$ignoredLines[$filename][$i] = TRUE;
-                            }
-
-                            break;
-                        }
 
                         $_token = trim($token);
+                        $_line  = trim($lines[$token->getLine() - 1]);
 
                         if ($_token == '// @codeCoverageIgnore' ||
                             $_token == '//@codeCoverageIgnore') {
@@ -149,6 +133,26 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
                                  $_token == '//@codeCoverageIgnoreEnd') {
                             $stop = TRUE;
                         }
+
+                        // be sure the comment doesn't have some token BEFORE it on the same line...
+                        // it would not be safe to ignore the whole line in those cases.
+                        if (0 === strpos($_token, $_line)) {
+                            $count = substr_count($token, "\n");
+                            $line  = $token->getLine();
+
+                            for ($i = $line; $i < $line + $count; $i++) {
+                                self::$ignoredLines[$filename][$i] = TRUE;
+                            }
+
+                            if ($token instanceof PHP_Token_DOC_COMMENT) {
+                                // Workaround for the fact the DOC_COMMENT token
+                                // does not include the final \n character in its
+                                // text.
+                                if (substr(trim($lines[$i-1]), -2) == '*/') {
+                                    self::$ignoredLines[$filename][$i] = TRUE;
+                                }
+                            }
+                        }
                     }
                     break;