Merge branch '10.0'

Author: sebastianbergmann

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -81,12 +81,19 @@ public function enterNode(Node $node): void
             return;
         }
 
+        if ($node instanceof Node\Stmt\Interface_) {
+            foreach (range($node->getStartLine(), $node->getEndLine()) as $line) {
+                $this->unsets[$line] = true;
+            }
+
+            return;
+        }
+
         if ($node instanceof Node\Stmt\Declare_ ||
             $node instanceof Node\Stmt\DeclareDeclare ||
             $node instanceof Node\Stmt\Else_ ||
             $node instanceof Node\Stmt\EnumCase ||
             $node instanceof Node\Stmt\Finally_ ||
-            $node instanceof Node\Stmt\Interface_ ||
             $node instanceof Node\Stmt\Label ||
             $node instanceof Node\Stmt\Namespace_ ||
             $node instanceof Node\Stmt\Nop ||

tests/_files/source_for_branched_exec_lines.php

@@ -562,13 +562,18 @@ public function withMultilineStrings()
 
 interface MyInterface
 {
+    public const MY_INTERFACE_CONST = 1;
+    public const MY_INTERFACE_COMPLEX_CONST = [
+        1,
+        'string',
+    ];
     public function myMethod();
 }
 
 trait MyTrait
 {
     public function myTrait()
-    {}                                      // +1
+    {}                                      // +3
 }
 
 abstract class MyAbstractClass implements MyInterface

tests/_files/source_for_branched_exec_lines_php82.php

@@ -8,3 +8,9 @@ public function bar((A&B)|null $entity)
         return $entity;                     // +1
     }
 }
+
+// Const in traits
+trait MyConstInTrait
+{
+    public const MY_TRAIT_CONST = 1;
+}