Merge branch '9.2' into 10.1

sebastianbergmann · sebastianbergmann · commit 2096eca68f0d · 2024-06-29T10:08:28.000+02:00
diff --git a/tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php b/tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php
@@ -24,22 +24,22 @@ final class ExecutableLinesFindingVisitorTest extends TestCase
 {
     public function testExecutableLinesAreGroupedByBranch(): void
     {
-        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines.php');
+        $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines.php');
     }
 
     #[RequiresPhp('>=8.1')]
     public function testExecutableLinesAreGroupedByBranchPhp81(): void
     {
-        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php81.php');
+        $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines_php81.php');
     }
 
     #[RequiresPhp('>=8.2')]
     public function testExecutableLinesAreGroupedByBranchPhp82(): void
     {
-        $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php82.php');
+        $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines_php82.php');
     }
 
-    private function doTestSelfDescribingAsset(string $filename): void
+    private function doTestSelfDescribingAssert(string $filename): void
     {
         $source                        = file_get_contents($filename);
         $parser                        = (new ParserFactory)->createForHostVersion();

Original file line number	Diff line number	Diff line change
`@@ -24,22 +24,22 @@ final class ExecutableLinesFindingVisitorTest extends TestCase`
`24`	`24`	`{`
`25`	`25`	`public function testExecutableLinesAreGroupedByBranch(): void`
`26`	`26`	`{`
`27`		`- $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines.php');`
	`27`	`+ $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines.php');`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`#[RequiresPhp('>=8.1')]`
`31`	`31`	`public function testExecutableLinesAreGroupedByBranchPhp81(): void`
`32`	`32`	`{`
`33`		`- $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php81.php');`
	`33`	`+ $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines_php81.php');`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#[RequiresPhp('>=8.2')]`
`37`	`37`	`public function testExecutableLinesAreGroupedByBranchPhp82(): void`
`38`	`38`	`{`
`39`		`- $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php82.php');`
	`39`	`+ $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines_php82.php');`
`40`	`40`	`}`
`41`	`41`
`42`		`- private function doTestSelfDescribingAsset(string $filename): void`
	`42`	`+ private function doTestSelfDescribingAssert(string $filename): void`
`43`	`43`	`{`
`44`	`44`	`$source = file_get_contents($filename);`
`45`	`45`	`$parser = (new ParserFactory)->createForHostVersion();`