From b57ae08faa3f6d1f854833d40a3cfb1ea40b51e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 3 Jul 2024 19:02:25 +0200 Subject: [PATCH 1/3] Fix: Remove declaration of COMPOSER_ROOT_VERSION environment variable --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 758ad947..256ba907 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,9 +6,6 @@ on: name: CI -env: - COMPOSER_ROOT_VERSION: "9.2-dev" - jobs: coding-guidelines: name: Coding Guidelines From 48eb304ac0f79a29ed265978ca0e71b1579cd93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 16 Jul 2024 23:54:03 +0200 Subject: [PATCH 2/3] Fix: Adjust COMPOSER_ROOT_VERSION and branch alias --- .github/workflows/ci.yml | 3 +++ composer.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 256ba907..58ccfec4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,9 @@ on: name: CI +env: + COMPOSER_ROOT_VERSION: "9.2.x-dev" + jobs: coding-guidelines: name: Coding Guidelines diff --git a/composer.json b/composer.json index 37a6f160..4e3c0f6f 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,7 @@ }, "extra": { "branch-alias": { - "dev-main": "9.2-dev" + "dev-main": "9.2.x-dev" } } } From cfa5f0972763e046de8750b40947df259bf1ad5c Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sat, 29 Jun 2024 10:07:18 +0200 Subject: [PATCH 3/3] Fix method name --- .../ExecutableLinesFindingVisitorTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php b/tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php index aa71d035..659b69c7 100644 --- a/tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php +++ b/tests/tests/StaticAnalysis/ExecutableLinesFindingVisitorTest.php @@ -24,7 +24,7 @@ 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'); } /** @@ -32,7 +32,7 @@ public function testExecutableLinesAreGroupedByBranch(): void */ public function testExecutableLinesAreGroupedByBranchPhp74(): void { - $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php74.php'); + $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines_php74.php'); } /** @@ -40,7 +40,7 @@ public function testExecutableLinesAreGroupedByBranchPhp74(): void */ public function testExecutableLinesAreGroupedByBranchPhp80(): void { - $this->doTestSelfDescribingAsset(TEST_FILES_PATH . 'source_for_branched_exec_lines_php80.php'); + $this->doTestSelfDescribingAssert(TEST_FILES_PATH . 'source_for_branched_exec_lines_php80.php'); } /** @@ -48,7 +48,7 @@ public function testExecutableLinesAreGroupedByBranchPhp80(): void */ 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'); } /** @@ -56,10 +56,10 @@ public function testExecutableLinesAreGroupedByBranchPhp81(): void */ 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();