Merge pull request sebastianbergmann#159 from ashnazg/fix158

Author: sebastianbergmann

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;
 

Tests/PHP/CodeCoverage/UtilTest.php

@@ -164,17 +164,29 @@ public function testGetLinesToBeIgnoredOneLineAnnotations()
           array(
             1 => TRUE,
             2 => TRUE,
-            7 => TRUE,
             3 => TRUE,
             4 => TRUE,
             5 => TRUE,
             6 => TRUE,
+            7 => TRUE,
             8 => TRUE,
             9 => TRUE,
             10 => TRUE,
             11 => TRUE,
             12 => TRUE,
-            13 => TRUE
+            13 => TRUE,
+            14 => TRUE,
+            17 => TRUE,
+            19 => TRUE,
+            22 => TRUE,
+            23 => TRUE,
+            27 => TRUE,
+            28 => TRUE,
+            29 => TRUE,
+            30 => TRUE,
+            31 => TRUE,
+            32 => TRUE,
+            33 => TRUE,
           ),
           PHP_CodeCoverage_Util::getLinesToBeIgnored(
             TEST_FILES_PATH . 'source_with_oneline_annotations.php'

Tests/_files/source_with_oneline_annotations.php

@@ -11,3 +11,25 @@ public function bar()
     {
     }
 }
+
+function baz()
+{
+    // a one-line comment
+    print '*'; // a one-line comment
+
+    /* a one-line comment */
+    print '*'; /* a one-line comment */
+
+    /* a one-line comment
+     */
+    print '*'; /* a one-line comment
+    */
+
+    print '*'; // @codeCoverageIgnore
+
+    print '*'; // @codeCoverageIgnoreStart
+    print '*';
+    print '*'; // @codeCoverageIgnoreEnd
+
+    print '*';
+}