Ignore lines that contain an interface, trait, class, or function keyword

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -715,6 +715,8 @@ private function getLinesToBeIgnored($filename)
                     case 'PHP_Token_FUNCTION': {
                         $docblock = $token->getDocblock();
 
+                        $this->ignoredLines[$filename][] = $token->getLine();
+
                         if (strpos($docblock, '@codeCoverageIgnore')) {
                             $endLine = $token->getEndLine();
 

Tests/PHP/CodeCoverageTest.php

@@ -366,6 +366,7 @@ public function testGetLinesToBeIgnored()
             25,
             26,
             27,
+            28,
             30,
             32,
             33,
@@ -404,15 +405,17 @@ public function testGetLinesToBeIgnored3()
     {
         $this->assertEquals(
           array(
-            0 => 1,
-            1 => 2,
-            2 => 3,
-            3 => 4,
-            4 => 8,
-            5 => 15,
-            6 => 16,
-            7 => 19,
-            8 => 20
+            1,
+            2,
+            3,
+            4,
+            5,
+            8,
+            11,
+            15,
+            16,
+            19,
+            20
           ),
           $this->getLinesToBeIgnored()->invoke(
             $this->coverage,
@@ -428,32 +431,33 @@ public function testGetLinesToBeIgnoredOneLineAnnotations()
     {
         $this->assertEquals(
           array(
-            0 => 1,
-            1 => 2,
-            2 => 3,
-            3 => 4,
-            4 => 5,
-            5 => 6,
-            6 => 7,
-            7 => 8,
-            8 => 9,
-            9 => 10,
-            10 => 11,
-            11 => 12,
-            12 => 13,
-            13 => 14,
-            14 => 17,
-            15 => 19,
-            16 => 22,
-            17 => 23,
-            18 => 27,
-            19 => 28,
-            20 => 29,
-            21 => 30,
-            22 => 31,
-            23 => 32,
-            24 => 33,
-            25 => 36
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            17,
+            19,
+            22,
+            23,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            36
           ),
           $this->getLinesToBeIgnored()->invoke(
             $this->coverage,

Tests/_files/class-with-anonymous-function-clover.xml

@@ -3,7 +3,7 @@
   <project timestamp="%i">
     <file name="%s/source_with_class_and_anonymous_function.php">
       <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
-        <metrics methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="5" elements="8" coveredelements="6"/>
+        <metrics methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
       </class>
       <line num="5" type="method" name="runAnonymous" crap="1.04" count="1"/>
       <line num="7" type="stmt" count="1"/>
@@ -15,8 +15,8 @@
       <line num="14" type="stmt" count="1"/>
       <line num="17" type="stmt" count="1"/>
       <line num="18" type="stmt" count="1"/>
-      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="11" coveredelements="9"/>
+      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="11" coveredelements="9"/>
+    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
   </project>
 </coverage>