Merge branch '9.2'

Author: sebastianbergmann

ChangeLog.md

@@ -20,6 +20,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 * [#736](https://github.com/sebastianbergmann/php-code-coverage/issues/736): HTML report generator allows invalid values for low upper bound and high lower bound
 * [#854](https://github.com/sebastianbergmann/php-code-coverage/issues/854): "Class Coverage Distribution" and "Class Complexity" graphs are not displayed at full width
+* [#897](https://github.com/sebastianbergmann/php-code-coverage/issues/897): `declare(strict_types=1)` marked as uncovered
 
 ## [9.2.11] - 2022-02-18
 

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -18,7 +18,7 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Ternary;
-use PhpParser\Node\Scalar;
+use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\Catch_;
@@ -133,6 +133,7 @@ private function isExecutable(Node $node): bool
                $node instanceof Echo_ ||
                $node instanceof ElseIf_ ||
                $node instanceof Else_ ||
+               $node instanceof Encapsed ||
                $node instanceof Expression ||
                $node instanceof Finally_ ||
                $node instanceof For_ ||
@@ -142,7 +143,6 @@ private function isExecutable(Node $node): bool
                $node instanceof NullsafePropertyFetch ||
                $node instanceof PropertyFetch ||
                $node instanceof Return_ ||
-               $node instanceof Scalar ||
                $node instanceof StaticPropertyFetch ||
                $node instanceof Switch_ ||
                $node instanceof Ternary ||

tests/tests/RawCodeCoverageDataTest.php

@@ -228,7 +228,6 @@ public function testUseStatementsAreUncovered(): void
             [
                 12,
                 14,
-                15,
                 16,
                 18,
             ],
@@ -256,7 +255,6 @@ public function testInterfacesAreUncovered(): void
             [
                 7,
                 9,
-                10,
                 11,
                 13,
             ],
@@ -298,13 +296,9 @@ public function testHeavyIndentationIsHandledCorrectly(): void
                 25,
                 28,
                 31,
-                33,
-                38,
                 40,
                 46,
                 48,
-                50,
-                52,
                 54,
                 60,
                 71,