Merge pull request sebastianbergmann#77 from dharkness/ignore-single-line

Author: sebastianbergmann

PHP/CodeCoverage/Util.php

@@ -253,8 +253,14 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
                     case 'PHP_Token_COMMENT': {
                         $_token = trim($token);
 
-                        if ($_token == '// @codeCoverageIgnoreStart' ||
-                            $_token == '//@codeCoverageIgnoreStart') {
+                        if ($_token == '// @codeCoverageIgnore' ||
+                            $_token == '//@codeCoverageIgnore') {
+                            $ignore = TRUE;
+                            $stop   = TRUE;
+                        }
+
+                        else if ($_token == '// @codeCoverageIgnoreStart' ||
+                                 $_token == '//@codeCoverageIgnoreStart') {
                             $ignore = TRUE;
                         }
 

Tests/PHP/CodeCoverage/UtilTest.php

@@ -207,7 +207,8 @@ public function testGetLinesToBeIgnored()
             22 => TRUE,
             23 => TRUE,
             24 => TRUE,
-            25 => TRUE
+            25 => TRUE,
+            30 => TRUE
           ),
           PHP_CodeCoverage_Util::getLinesToBeIgnored(
             TEST_FILES_PATH . 'source_with_ignore.php'

Tests/_files/source_with_ignore.php

@@ -24,3 +24,8 @@ public function foo()
     {
     }
 }
+
+function baz()
+{
+    print '*'; // @codeCoverageIgnore
+}