Merge branch '9.2'

Author: sebastianbergmann

ChangeLog.md

@@ -25,6 +25,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 ### Fixed
 
 * [#971](https://github.com/sebastianbergmann/php-code-coverage/issues/971): PHP report does not handle serialized code coverage data larger than 2 GB
+* [#974](https://github.com/sebastianbergmann/php-code-coverage/issues/974): Executable line analysis fails for declarations with enumerations and unions
 
 ## [9.2.22] - 2022-12-18
 

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -85,6 +85,7 @@ public function enterNode(Node $node): void
         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 ||
@@ -96,6 +97,7 @@ public function enterNode(Node $node): void
             $node instanceof Node\Stmt\UseUse ||
             $node instanceof Node\Expr\Match_ ||
             $node instanceof Node\Expr\Variable ||
+            $node instanceof Node\ComplexType ||
             $node instanceof Node\Const_ ||
             $node instanceof Node\Identifier ||
             $node instanceof Node\Name ||
@@ -110,12 +112,13 @@ public function enterNode(Node $node): void
             return;
         }
 
-        if ($node instanceof Node\Stmt\Function_ ||
+        if ($node instanceof Node\Stmt\Enum_ ||
+            $node instanceof Node\Stmt\Function_ ||
             $node instanceof Node\Stmt\Class_ ||
             $node instanceof Node\Stmt\ClassMethod ||
             $node instanceof Node\Expr\Closure ||
             $node instanceof Node\Stmt\Trait_) {
-            $isConcreteClassLike = $node instanceof Node\Stmt\Class_ || $node instanceof Node\Stmt\Trait_;
+            $isConcreteClassLike = $node instanceof Node\Stmt\Enum_ || $node instanceof Node\Stmt\Class_ || $node instanceof Node\Stmt\Trait_;
 
             if (null !== $node->stmts) {
                 foreach ($node->stmts as $stmt) {

tests/_files/source_for_branched_exec_lines_php80.php

@@ -33,3 +33,10 @@
 // Nullsafe Operator
 $ymd = $date?->format('Ymd');       // +1
 ++$var;                             // +1
+
+// Union types
+interface MyUnion
+{
+    public function getNameIdentifier(): ?string;
+    public function hasClaim(bool|string $type, mixed $value): bool;
+}

tests/_files/source_for_branched_exec_lines_php81.php

@@ -0,0 +1,34 @@
+<?php
+
+// Enum
+enum BasicSuit
+{
+    case Hearts;
+    case Diamonds;
+    case Clubs;
+    case Spades;
+
+    public function shape(): string
+    {
+        return "Rectangle";         // +1
+    }
+}
+
+enum BackedSuit: string
+{
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
+}
+
+BasicSuit::Diamonds->shape();       // +1
+BackedSuit::Clubs;                  // +1
+
+
+// Intersection types
+interface MyIntersection
+{
+    public function check(MyIntOne&MyIntTwo $intersection);
+    public function neverReturn(): never;
+}

tests/_files/source_for_branched_exec_lines_php82.php

@@ -0,0 +1,10 @@
+<?php
+
+// Disjunctive Normal Form (DNF)
+class MyDnf
+{
+    public function bar((A&B)|null $entity)
+    {
+        return $entity;                     // +1
+    }
+}

tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php

@@ -44,6 +44,22 @@ public function testExecutableLinesAreGroupedByBranchPhp80(): void
         $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php80.php');
     }
 
+    /**
+     * @requires PHP 8.1
+     */
+    public function testExecutableLinesAreGroupedByBranchPhp81(): void
+    {
+        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php81.php');
+    }
+
+    /**
+     * @requires PHP 8.2
+     */
+    public function testExecutableLinesAreGroupedByBranchPhp82(): void
+    {
+        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php82.php');
+    }
+
     private function doTestSelfDescribingAsset(string $filename): void
     {
         $source = file_get_contents($filename);