Explicitly ignore lines containing Class/Trait/Interface tokens. Fixes sebastianbergmann#774

Author: dvdoug

src/CodeCoverage.php

@@ -566,6 +566,8 @@ private function getLinesToBeIgnoredInner(string $fileName): array
                 case PHP_Token_INTERFACE::class:
                 case PHP_Token_TRAIT::class:
                 case PHP_Token_CLASS::class:
+                    $this->ignoredLines[$fileName][] = $token->getLine(); //work around https://bugs.xdebug.org/view.php?id=1798
+                // Intentional fallthrough
                 case PHP_Token_FUNCTION::class:
                     /* @var \PHP_Token_Interface $token */
 

tests/tests/BuilderTest.php

@@ -156,11 +156,11 @@ public function testNotCrashParsing(): void
         $expectedPath = rtrim(TEST_FILES_PATH, DIRECTORY_SEPARATOR);
         $this->assertEquals($expectedPath, $root->name());
         $this->assertEquals($expectedPath, $root->pathAsString());
-        $this->assertEquals(2, $root->numberOfExecutableLines());
+        $this->assertEquals(1, $root->numberOfExecutableLines());
         $this->assertEquals(0, $root->numberOfExecutedLines());
         $data         = $coverage->getData()->lineCoverage();
         $expectedFile = $expectedPath . DIRECTORY_SEPARATOR . 'Crash.php';
-        $this->assertSame([$expectedFile => [1 => [], 2 => []]], $data);
+        $this->assertSame([$expectedFile => [1 => []]], $data);
     }
 
     public function testBuildDirectoryStructure(): void

tests/tests/CodeCoverageTest.php

@@ -143,10 +143,12 @@ public function testGetLinesToBeIgnored(): void
                 14,
                 15,
                 16,
+                18,
                 23,
                 24,
                 25,
                 30,
+                33,
             ],
             $this->getLinesToBeIgnored()->invoke(
                 $this->coverage,
@@ -169,7 +171,9 @@ public function testGetLinesToBeIgnored2(): void
     public function testGetLinesToBeIgnored3(): void
     {
         $this->assertEquals(
-            [],
+            [
+                3,
+            ],
             $this->getLinesToBeIgnored()->invoke(
                 $this->coverage,
                 TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php'
@@ -181,6 +185,8 @@ public function testGetLinesToBeIgnoredOneLineAnnotations(): void
     {
         $this->assertEquals(
             [
+                4,
+                9,
                 29,
                 31,
                 32,