Exclude in-toto non ClassMethods lines from class analysis

Author: Slamdunk

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -9,6 +9,7 @@
  */
 namespace SebastianBergmann\CodeCoverage\StaticAnalysis;
 
+use function array_diff_key;
 use function array_search;
 use function count;
 use function current;
@@ -38,6 +39,8 @@ final class ExecutableLinesFindingVisitor extends NodeVisitorAbstract
      */
     private $executableLinesGroupedByBranch = [];
 
+    private $unsets = [];
+
     public function __construct(string $source)
     {
         $this->source = $source;
@@ -47,23 +50,39 @@ public function enterNode(Node $node): void
     {
         if ($node instanceof Node\Stmt\Declare_ ||
             $node instanceof Node\Stmt\DeclareDeclare ||
-            $node instanceof Node\Stmt\Class_ ||
-            $node instanceof Node\Stmt\ClassConst ||
             $node instanceof Node\Stmt\Interface_ ||
+            $node instanceof Node\Stmt\Namespace_ ||
             $node instanceof Node\Stmt\Nop ||
-            $node instanceof Node\Stmt\Property ||
-            $node instanceof Node\Stmt\PropertyProperty ||
-            $node instanceof Node\Stmt\Trait_ ||
+            $node instanceof Node\Stmt\Use_ ||
+            $node instanceof Node\Stmt\UseUse ||
             $node instanceof Node\Expr\Variable ||
+            $node instanceof Node\Name ||
             $node instanceof Node\Param ||
             $node instanceof Node\Const_ ||
             $node instanceof Node\Scalar ||
-            $node instanceof Node\Identifier ||
-            $node instanceof Node\VarLikeIdentifier
+            $node instanceof Node\Identifier
         ) {
             return;
         }
 
+        if ($node instanceof Node\Stmt\Class_ ||
+            $node instanceof Node\Stmt\Trait_
+        ) {
+            foreach ($node->stmts as $stmt) {
+                if ($stmt instanceof Node\Stmt\ClassMethod ||
+                    $stmt instanceof Node\Stmt\Nop
+                ) {
+                    continue;
+                }
+
+                foreach (range($stmt->getStartLine(), $stmt->getEndLine()) as $line) {
+                    $this->unsets[$line] = true;
+                }
+            }
+
+            return;
+        }
+
         if ($node instanceof Node\Expr\ArrowFunction) {
             $startLine = max(
                 $node->getStartLine() + 1,
@@ -292,6 +311,11 @@ public function afterTraverse(array $nodes): void
 
             unset($this->executableLinesGroupedByBranch[1 + $lineNumber]);
         }
+
+        $this->executableLinesGroupedByBranch = array_diff_key(
+            $this->executableLinesGroupedByBranch,
+            $this->unsets
+        );
     }
 
     public function executableLinesGroupedByBranch(): array

tests/_files/source_for_branched_exec_lines.php

@@ -2,6 +2,10 @@
 
 declare(strict_types=1);
 
+namespace MyNamespace;
+
+use DateTimeInterface;
+
 // Integer in comments represent the branch index difference
 // relative to the previous line
 
@@ -460,4 +464,18 @@ trait MyTrait
 {
     public function myTrait()
     {}                                      // +1
-}
+}
+
+abstract class MyAbstractClass implements MyInterface
+{}
+final class MyFinalClass extends MyAbstractClass
+{
+    use MyTrait;
+    public const STRUCT = [
+        'foo' => 'bar',
+    ];
+    private readonly string $var;
+    public function myMethod(): void
+    {
+    }                                       // +1
+}