From b61113f1a826764cb7ca960ae88290f4e5c88fbc Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 12 Jul 2024 08:02:26 +0200 Subject: [PATCH 1/6] Bump dependencies (so that users that install using Composer's --prefer-lowest CLI option also get recent versions) --- ChangeLog-10.1.md | 7 +++++++ composer.json | 20 ++++++++++---------- src/Version.php | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ChangeLog-10.1.md b/ChangeLog-10.1.md index a1f32734..2f1b4044 100644 --- a/ChangeLog-10.1.md +++ b/ChangeLog-10.1.md @@ -2,6 +2,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [10.1.16] - 2024-07-12 + +### Changed + +* Updated dependencies (so that users that install using Composer's `--prefer-lowest` CLI option also get recent versions) + ## [10.1.15] - 2024-06-29 ### Fixed @@ -107,6 +113,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * The `SebastianBergmann\CodeCoverage\Filter::includeDirectory()`, `SebastianBergmann\CodeCoverage\Filter::excludeDirectory()`, and `SebastianBergmann\CodeCoverage\Filter::excludeFile()` methods are now deprecated +[10.1.16]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.15...10.1.16 [10.1.15]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.14...10.1.15 [10.1.14]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.13...10.1.14 [10.1.13]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.12...10.1.13 diff --git a/composer.json b/composer.json index 6e2ed05e..9d006085 100644 --- a/composer.json +++ b/composer.json @@ -33,18 +33,18 @@ "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" + "nikic/php-parser": "^4.19.1 || ^5.1.0", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-text-template": "^3.0.1", + "sebastian/code-unit-reverse-lookup": "^3.0.0", + "sebastian/complexity": "^3.2.0", + "sebastian/environment": "^6.1.0", + "sebastian/lines-of-code": "^2.0.2", + "sebastian/version": "^4.0.1", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^10.1" + "phpunit/phpunit": "^10.5.27" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", diff --git a/src/Version.php b/src/Version.php index e30910b9..80b27f4d 100644 --- a/src/Version.php +++ b/src/Version.php @@ -19,7 +19,7 @@ final class Version public static function id(): string { if (self::$version === '') { - self::$version = (new VersionId('10.1.15', dirname(__DIR__)))->asString(); + self::$version = (new VersionId('10.1.16', dirname(__DIR__)))->asString(); } return self::$version; From 0bd67077a1d393c43d5c89a64f5deeb0937cff8b Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 12 Jul 2024 08:06:58 +0200 Subject: [PATCH 2/6] Revert "Bump dependencies (so that users that install using Composer's --prefer-lowest CLI option also get recent versions)" This reverts commit b61113f1a826764cb7ca960ae88290f4e5c88fbc. --- ChangeLog-10.1.md | 7 ------- composer.json | 20 ++++++++++---------- src/Version.php | 2 +- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ChangeLog-10.1.md b/ChangeLog-10.1.md index 2f1b4044..a1f32734 100644 --- a/ChangeLog-10.1.md +++ b/ChangeLog-10.1.md @@ -2,12 +2,6 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. -## [10.1.16] - 2024-07-12 - -### Changed - -* Updated dependencies (so that users that install using Composer's `--prefer-lowest` CLI option also get recent versions) - ## [10.1.15] - 2024-06-29 ### Fixed @@ -113,7 +107,6 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * The `SebastianBergmann\CodeCoverage\Filter::includeDirectory()`, `SebastianBergmann\CodeCoverage\Filter::excludeDirectory()`, and `SebastianBergmann\CodeCoverage\Filter::excludeFile()` methods are now deprecated -[10.1.16]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.15...10.1.16 [10.1.15]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.14...10.1.15 [10.1.14]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.13...10.1.14 [10.1.13]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.12...10.1.13 diff --git a/composer.json b/composer.json index 9d006085..6e2ed05e 100644 --- a/composer.json +++ b/composer.json @@ -33,18 +33,18 @@ "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.19.1 || ^5.1.0", - "phpunit/php-file-iterator": "^4.1.0", - "phpunit/php-text-template": "^3.0.1", - "sebastian/code-unit-reverse-lookup": "^3.0.0", - "sebastian/complexity": "^3.2.0", - "sebastian/environment": "^6.1.0", - "sebastian/lines-of-code": "^2.0.2", - "sebastian/version": "^4.0.1", - "theseer/tokenizer": "^1.2.3" + "nikic/php-parser": "^4.18 || ^5.0", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-text-template": "^3.0", + "sebastian/code-unit-reverse-lookup": "^3.0", + "sebastian/complexity": "^3.0", + "sebastian/environment": "^6.0", + "sebastian/lines-of-code": "^2.0", + "sebastian/version": "^4.0", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^10.5.27" + "phpunit/phpunit": "^10.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", diff --git a/src/Version.php b/src/Version.php index 80b27f4d..e30910b9 100644 --- a/src/Version.php +++ b/src/Version.php @@ -19,7 +19,7 @@ final class Version public static function id(): string { if (self::$version === '') { - self::$version = (new VersionId('10.1.16', dirname(__DIR__)))->asString(); + self::$version = (new VersionId('10.1.15', dirname(__DIR__)))->asString(); } return self::$version; 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 3/6] 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 4/6] 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 5/6] 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(); From 09d5f55e54c20f2353a790d09772db3ad577b9ac Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Wed, 17 Jul 2024 07:15:22 +0200 Subject: [PATCH 6/6] Sync with https://github.com/sebastianbergmann/phpunit/blob/10.5.27/.github/workflows/ci.yaml#L107 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29fe1692..5db89ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: runs-on: ${{ matrix.os }} env: - PHP_EXTENSIONS: none, dom, json, libxml, mbstring, openssl, pdo_sqlite, soap, tokenizer, xml, xmlwriter + PHP_EXTENSIONS: none, ctype, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter PHP_INI_VALUES: memory_limit=-1, assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On strategy: