Tests different features only for related supported by PHP versions

Author: Slamdunk

tests/_files/source_for_branched_exec_lines.php

@@ -239,37 +239,6 @@ public function withSwitch()
                 ++$var;                     // +1
         endswitch;
     }
-    public function withMatch()
-    {
-        $var = 1;                           // +1
-        $var2 = match ($var) {              // +1
-            0 => ++$var,                    // 0
-            1 => ++$var,                    // 0
-            default => ++$var,              // 0
-        };                                  // 0
-        $var2                               // +1
-            =                               // 0
-            match                           // 0
-            (                               // 0
-            $var                            // 0
-            )                               // 0
-            {                               // 0
-                0                           // 0
-                =>                          // 0
-                ++$var                      // 0
-            ,                               // 0
-                1,                          // 0
-                2                           // 0
-                =>                          // 0
-                ++$var                      // 0
-            ,                               // 0
-                default                     // 0
-                =>                          // 0
-                ++$var                      // 0
-            ,                               // 0
-        }                                   // 0
-        ;                                   // 0
-    }
     public function withReturn()
     {
         $var = 1;                           // +1
@@ -415,8 +384,6 @@ public function withCall()
             )                               // 0
         ;                                   // 0
         ++$var;                             // +1
-        $ymd = $date?->format('Ymd');       // +1
-        ++$var;                             // +1
         $date = \DateTime::createFromImmutable($date);       // +1
         $date                               // +1
             =                               // 0
@@ -485,17 +452,10 @@ public function myMethod()
             }                               // -3
         ;                                   // 0
     }
-    public function withArrowFn()
-    {
-        $y = 1;                             // +4
-        $fn1 = fn($x) => $x + $y;           // +1
-        $fn1 = fn($x) =>                    // +1
-            $x + $y;                        // +1
-    }
     public function withComments()
     {
         /** @var int $var */
-        $var = 1;                           // +1
+        $var = 1;                           // +4
         /** @var int $var */
         $var = 2;                           // +1
         // C3
@@ -567,7 +527,7 @@ final class MyFinalClass extends MyAbstractClass
     public const STRUCT = [
         'foo' => 'bar',
     ];
-    private readonly string $var;
+    private string $var;
     public function myMethod(): void
     {
     }                                       // +4

tests/_files/source_for_branched_exec_lines_php74.php

@@ -0,0 +1,6 @@
+<?php
+
+// Arrow functions
+$fn1 = fn($x) => $x + $y;           // +1
+$fn1 = fn($x) =>                    // +1
+    $x + $y;                        // +1

tests/_files/source_for_branched_exec_lines_php80.php

@@ -0,0 +1,35 @@
+<?php
+
+// Match
+$var = 1;                           // +1
+$var2 = match ($var) {              // +1
+    0 => ++$var,                    // 0
+    1 => ++$var,                    // 0
+    default => ++$var,              // 0
+};                                  // 0
+$var2                               // +1
+    =                               // 0
+    match                           // 0
+    (                               // 0
+    $var                            // 0
+    )                               // 0
+    {                               // 0
+        0                           // 0
+        =>                          // 0
+        ++$var                      // 0
+    ,                               // 0
+        1,                          // 0
+        2                           // 0
+        =>                          // 0
+        ++$var                      // 0
+    ,                               // 0
+        default                     // 0
+        =>                          // 0
+        ++$var                      // 0
+    ,                               // 0
+}                                   // 0
+;                                   // 0
+
+// Nullsafe Operator
+$ymd = $date?->format('Ymd');       // +1
+++$var;                             // +1

tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php

@@ -24,7 +24,28 @@ final class ExecutableLinesFindingVisitorTest extends TestCase
 {
     public function testExecutableLinesAreGroupedByBranch(): void
     {
-        $source = file_get_contents(TEST_FILES_PATH . 'source_for_branched_exec_lines.php');
+        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines.php');
+    }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function testExecutableLinesAreGroupedByBranchPhp74(): void
+    {
+        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php74.php');
+    }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testExecutableLinesAreGroupedByBranchPhp80(): void
+    {
+        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php80.php');
+    }
+
+    private function doTestSelfDescribingAsset(string $filename): void
+    {
+        $source = file_get_contents($filename);
         $parser = (new ParserFactory)->create(
             ParserFactory::PREFER_PHP7,
             new Lexer