Fix sebastianbergmann#793

Author: sebastianbergmann

ChangeLog.md

@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [9.1.4] - 2020-MM-DD
+
+### Fixed
+
+* [#793](https://github.com/sebastianbergmann/php-code-coverage/issues/793): Lines with `::class` constant are not covered
+
 ## [9.1.3] - 2020-08-10
 
 ### Changed
@@ -213,6 +219,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * Class names are now abbreviated (unqualified name shown, fully qualified name shown on hover) in the file view of the HTML report
 * Update HTML report to Bootstrap 4
 
+[9.1.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.1.3...master
 [9.1.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.1.2...9.1.3
 [9.1.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.1.1...9.1.2
 [9.1.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.1.0...9.1.1

src/StaticAnalysis/IgnoredLinesFindingVisitor.php

@@ -16,6 +16,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
+use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Trait_;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitorAbstract;
@@ -27,20 +28,27 @@ final class IgnoredLinesFindingVisitor extends NodeVisitorAbstract
      */
     private $ignoredLines = [];
 
+    /**
+     * @var bool
+     */
+    private $useAnnotationsForIgnoringCode;
+
     /**
      * @var bool
      */
     private $ignoreDeprecated;
 
-    public function __construct(bool $ignoreDeprecated)
+    public function __construct(bool $useAnnotationsForIgnoringCode, bool $ignoreDeprecated)
     {
-        $this->ignoreDeprecated = $ignoreDeprecated;
+        $this->useAnnotationsForIgnoringCode = $useAnnotationsForIgnoringCode;
+        $this->ignoreDeprecated              = $ignoreDeprecated;
     }
 
     public function enterNode(Node $node): ?int
     {
         if (!$node instanceof Class_ &&
             !$node instanceof Trait_ &&
+            !$node instanceof Interface_ &&
             !$node instanceof ClassMethod &&
             !$node instanceof Function_) {
             return null;
@@ -50,6 +58,21 @@ public function enterNode(Node $node): ?int
             return null;
         }
 
+        // Workaround for https://bugs.xdebug.org/view.php?id=1798
+        if ($node instanceof Class_ ||
+            $node instanceof Trait_ ||
+            $node instanceof Interface_) {
+            $this->ignoredLines[] = $node->getStartLine();
+        }
+
+        if (!$this->useAnnotationsForIgnoringCode) {
+            return null;
+        }
+
+        if ($node instanceof Interface_) {
+            return null;
+        }
+
         $docComment = $node->getDocComment();
 
         if ($docComment === null) {

src/StaticAnalysis/ParsingCoveredFileAnalyser.php

@@ -127,20 +127,16 @@ private function analyse(string $filename): void
 
             assert($nodes !== null);
 
-            $traverser              = new NodeTraverser;
-            $codeUnitFindingVisitor = new CodeUnitFindingVisitor;
-            $lineCountingVisitor    = new LineCountingVisitor($linesOfCode);
+            $traverser                  = new NodeTraverser;
+            $codeUnitFindingVisitor     = new CodeUnitFindingVisitor;
+            $lineCountingVisitor        = new LineCountingVisitor($linesOfCode);
+            $ignoredLinesFindingVisitor = new IgnoredLinesFindingVisitor($this->useAnnotationsForIgnoringCode, $this->ignoreDeprecatedCode);
 
             $traverser->addVisitor(new NameResolver);
             $traverser->addVisitor(new ParentConnectingVisitor);
             $traverser->addVisitor($codeUnitFindingVisitor);
             $traverser->addVisitor($lineCountingVisitor);
-
-            if ($this->useAnnotationsForIgnoringCode) {
-                $ignoredLinesFindingVisitor = new IgnoredLinesFindingVisitor($this->ignoreDeprecatedCode);
-
-                $traverser->addVisitor($ignoredLinesFindingVisitor);
-            }
+            $traverser->addVisitor($ignoredLinesFindingVisitor);
 
             /* @noinspection UnusedFunctionResultInspection */
             $traverser->traverse($nodes);
@@ -166,14 +162,12 @@ private function analyse(string $filename): void
 
         $this->findLinesIgnoredByLineBasedAnnotations($filename, $source, $this->useAnnotationsForIgnoringCode);
 
-        if (isset($ignoredLinesFindingVisitor)) {
-            $this->ignoredLines[$filename] = array_merge(
+        $this->ignoredLines[$filename] = array_unique(
+            array_merge(
                 $this->ignoredLines[$filename],
                 $ignoredLinesFindingVisitor->ignoredLines()
-            );
-        }
-
-        $this->ignoredLines[$filename] = array_unique($this->ignoredLines[$filename]);
+            )
+        );
 
         sort($this->ignoredLines[$filename]);
     }
@@ -209,14 +203,6 @@ private function findLinesIgnoredByLineBasedAnnotations(string $filename, string
                         $stop = true;
                     }
 
-                    break;
-
-                case T_INTERFACE:
-                case T_TRAIT:
-                case T_CLASS:
-                    // Workaround for https://bugs.xdebug.org/view.php?id=1798
-                    $this->ignoredLines[$filename][] = $token[2];
-
                     break;
             }
 

tests/_files/source_with_class_and_fqcn_constant.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+class CoveredClassFullyQualifiedClassNameConstant
+{
+    public function method(): string
+    {
+        return self::class;
+    }
+}

tests/tests/FilterTest.php

@@ -72,6 +72,7 @@ protected function setUp(): void
             TEST_FILES_PATH . 'NamespacedBankAccount.php',
             TEST_FILES_PATH . 'NotExistingCoveredElementTest.php',
             TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php',
+            TEST_FILES_PATH . 'source_with_class_and_fqcn_constant.php',
             TEST_FILES_PATH . 'source_with_empty_class.php',
             TEST_FILES_PATH . 'source_with_ignore.php',
             TEST_FILES_PATH . 'source_with_interface.php',

tests/tests/StaticAnalysis/CoveredFileAnalyserTest.php

@@ -66,6 +66,22 @@ public function testGetLinesToBeIgnored3(): void
         );
     }
 
+    /**
+     * @ticket https://github.com/sebastianbergmann/php-code-coverage/issues/793
+     * @ticket https://github.com/sebastianbergmann/php-code-coverage/issues/794
+     */
+    public function testLineWithFullyQualifiedClassNameConstantIsNotIgnored(): void
+    {
+        $this->assertSame(
+            [
+                2,
+            ],
+            (new ParsingCoveredFileAnalyser(true, true))->ignoredLinesFor(
+                TEST_FILES_PATH . 'source_with_class_and_fqcn_constant.php'
+            )
+        );
+    }
+
     public function testGetLinesToBeIgnoredOneLineAnnotations(): void
     {
         $this->assertEquals(