Merge branch '9.2'

Author: sebastianbergmann

.phive/phars.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.0" installed="3.13.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.2.0" location="./tools/psalm" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.13.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.3.0" location="./tools/psalm" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.4.4" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -56,13 +56,13 @@
     </UnsupportedReferenceUsage>
   </file>
   <file src="src/Node/Directory.php">
+    <InvalidPropertyAssignmentValue occurrences="2">
+      <code>$this-&gt;directories</code>
+      <code>$this-&gt;files</code>
+    </InvalidPropertyAssignmentValue>
     <MissingTemplateParam occurrences="1">
       <code>IteratorAggregate</code>
     </MissingTemplateParam>
-    <PropertyTypeCoercion occurrences="2">
-      <code>$this-&gt;directories</code>
-      <code>$this-&gt;files</code>
-    </PropertyTypeCoercion>
     <UnsupportedReferenceUsage occurrences="2">
       <code>$this-&gt;directories[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
       <code>$this-&gt;files[]    = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
@@ -85,12 +85,24 @@
     <PropertyNotSetInConstructor occurrences="1">
       <code>$position</code>
     </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>$node-&gt;children()</code>
+    </PropertyTypeCoercion>
   </file>
   <file src="src/Report/Html/Renderer.php">
     <InvalidArgument occurrences="1"/>
+    <PossiblyUndefinedArrayOffset occurrences="4">
+      <code>$data['branchesExecutedPercentAsString']</code>
+      <code>$data['linesExecutedPercentAsString']</code>
+      <code>$data['pathsExecutedPercentAsString']</code>
+      <code>$data['testedMethodsPercentAsString']</code>
+    </PossiblyUndefinedArrayOffset>
   </file>
   <file src="src/Report/Html/Renderer/File.php">
     <InvalidArgument occurrences="1"/>
+    <InvalidArrayOffset occurrences="1">
+      <code>$tokens[$j - 1]</code>
+    </InvalidArrayOffset>
   </file>
   <file src="src/Report/Xml/BuildInformation.php">
     <PossiblyNullReference occurrences="1">

ChangeLog.md

@@ -20,6 +20,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * This component no longer supports PHPDBG
 * This component no longer supports Xdebug 2
 
+## [9.2.22] - 2022-12-18
+
+### Fixed
+
+* [#969](https://github.com/sebastianbergmann/php-code-coverage/pull/969): Fixed identifying line with `throw` as executable
+
 ## [9.2.21] - 2022-12-14
 
 ### Changed
@@ -464,6 +470,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * This component is no longer supported on PHP 7.1
 
 [10.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2...main
+[9.2.22]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.21...9.2.22
 [9.2.21]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.20...9.2.21
 [9.2.20]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.19...9.2.20
 [9.2.19]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.18...9.2.19

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -91,7 +91,6 @@ public function enterNode(Node $node): void
             $node instanceof Node\Stmt\Namespace_ ||
             $node instanceof Node\Stmt\Nop ||
             $node instanceof Node\Stmt\Switch_ ||
-            $node instanceof Node\Stmt\Throw_ ||
             $node instanceof Node\Stmt\TryCatch ||
             $node instanceof Node\Stmt\Use_ ||
             $node instanceof Node\Stmt\UseUse ||
@@ -105,6 +104,12 @@ public function enterNode(Node $node): void
             return;
         }
 
+        if ($node instanceof Node\Stmt\Throw_) {
+            $this->setLineBranch($node->expr->getEndLine(), $node->expr->getEndLine(), ++$this->nextBranch);
+
+            return;
+        }
+
         if ($node instanceof Node\Stmt\Function_ ||
             $node instanceof Node\Stmt\Class_ ||
             $node instanceof Node\Stmt\ClassMethod ||

tests/_files/source_for_branched_exec_lines.php

@@ -310,9 +310,13 @@ public function withThrow()
         try {
             ++$var;                         // +1
             throw
-            new                             // +1
+            new                             // +2
             \Exception()                    // 0
             ;
+            $myex = new \Exception();       // +1
+            throw
+                $myex                       // +1
+            ;
             ++$var;                         // +1
         } catch (\Exception $exception) {   // +1
             ++$var;                         // +1