Merge branch '1.2'

Author: sebastianbergmann

PHP/CodeCoverage/Util.php

@@ -112,6 +112,7 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
 
             foreach ($tokens as $token) {
                 switch (get_class($token)) {
+                    case 'PHP_Token_COMMENT':
                     case 'PHP_Token_DOC_COMMENT': {
                         $count = substr_count($token, "\n");
                         $line  = $token->getLine();
@@ -125,6 +126,28 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
                         if (substr(trim($lines[$i-1]), -2) == '*/') {
                             self::$ignoredLines[$filename][$i] = TRUE;
                         }
+
+                        if (!$token instanceof PHP_Token_COMMENT) {
+                            break;
+                        }
+
+                        $_token = trim($token);
+
+                        if ($_token == '// @codeCoverageIgnore' ||
+                            $_token == '//@codeCoverageIgnore') {
+                            $ignore = TRUE;
+                            $stop   = TRUE;
+                        }
+
+                        else if ($_token == '// @codeCoverageIgnoreStart' ||
+                                 $_token == '//@codeCoverageIgnoreStart') {
+                            $ignore = TRUE;
+                        }
+
+                        else if ($_token == '// @codeCoverageIgnoreEnd' ||
+                                 $_token == '//@codeCoverageIgnoreEnd') {
+                            $stop = TRUE;
+                        }
                     }
                     break;
 
@@ -198,27 +221,6 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
                         self::$ignoredLines[$filename][$token->getLine()] = TRUE;
                     }
                     break;
-
-                    case 'PHP_Token_COMMENT': {
-                        $_token = trim($token);
-
-                        if ($_token == '// @codeCoverageIgnore' ||
-                            $_token == '//@codeCoverageIgnore') {
-                            $ignore = TRUE;
-                            $stop   = TRUE;
-                        }
-
-                        else if ($_token == '// @codeCoverageIgnoreStart' ||
-                                 $_token == '//@codeCoverageIgnoreStart') {
-                            $ignore = TRUE;
-                        }
-
-                        else if ($_token == '// @codeCoverageIgnoreEnd' ||
-                                 $_token == '//@codeCoverageIgnoreEnd') {
-                            $stop = TRUE;
-                        }
-                    }
-                    break;
                 }
 
                 if ($ignore) {