Merge branch '9.2'

Author: sebastianbergmann

src/StaticAnalysis/IgnoredLinesFindingVisitor.php

@@ -10,8 +10,10 @@
 namespace SebastianBergmann\CodeCoverage\StaticAnalysis;
 
 use function array_merge;
+use function assert;
 use function range;
 use PhpParser\Node;
+use PhpParser\Node\Attribute;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
@@ -45,19 +47,25 @@ public function enterNode(Node $node): void
             !$node instanceof Trait_ &&
             !$node instanceof Interface_ &&
             !$node instanceof ClassMethod &&
-            !$node instanceof Function_) {
+            !$node instanceof Function_ &&
+            !$node instanceof Attribute) {
             return;
         }
 
         if ($node instanceof Class_ && $node->isAnonymous()) {
             return;
         }
 
-        // Workaround for https://bugs.xdebug.org/view.php?id=1798
         if ($node instanceof Class_ ||
             $node instanceof Trait_ ||
-            $node instanceof Interface_) {
+            $node instanceof Interface_ ||
+            $node instanceof Attribute) {
             $this->ignoredLines[] = $node->getStartLine();
+
+            assert($node->name !== null);
+
+            // Workaround for https://github.com/nikic/PHP-Parser/issues/886
+            $this->ignoredLines[] = $node->name->getStartLine();
         }
 
         if (!$this->useAnnotationsForIgnoringCode) {
@@ -68,6 +76,19 @@ public function enterNode(Node $node): void
             return;
         }
 
+        $this->processDocComment($node);
+    }
+
+    /**
+     * @psalm-return list<int>
+     */
+    public function ignoredLines(): array
+    {
+        return $this->ignoredLines;
+    }
+
+    private function processDocComment(Node $node): void
+    {
         $docComment = $node->getDocComment();
 
         if ($docComment === null) {
@@ -88,12 +109,4 @@ public function enterNode(Node $node): void
             );
         }
     }
-
-    /**
-     * @psalm-return list<int>
-     */
-    public function ignoredLines(): array
-    {
-        return $this->ignoredLines;
-    }
 }

tests/_files/source_with_ignore_attributes.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+use PHPUnit\Framework\Attributes\CodeCoverageIgnore;
+
+#[CodeCoverageIgnore]
+class Foo
+{
+    public function bar(): void
+    {
+    }
+}
+
+class Bar
+{
+    #[CodeCoverageIgnore]
+    public function foo(): void
+    {
+    }
+}

tests/tests/StaticAnalysis/ParsingFileAnalyserTest.php

@@ -135,4 +135,19 @@ public function testGetLinesOfCodeForFileCrLineEndings(): void
         $this->assertSame(2, $result['commentLinesOfCode']);
         $this->assertSame(2, $result['nonCommentLinesOfCode']);
     }
+
+    public function testLinesCanBeIgnoredUsingAttribute(): void
+    {
+        $this->assertSame(
+            [
+                4,
+                5,
+                12,
+                14,
+            ],
+            (new ParsingFileAnalyser(true, true))->ignoredLinesFor(
+                TEST_FILES_PATH . 'source_with_ignore_attributes.php'
+            )
+        );
+    }
 }