From 3123601e3b29339b20129acc3f989cfec3274566 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 27 Nov 2020 13:46:45 +0100 Subject: [PATCH 1/3] Prepare release --- ChangeLog-8.5.md | 7 +++++++ composer.json | 2 +- src/Runner/Version.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md index 2aac4655122..6e03b78c0d7 100644 --- a/ChangeLog-8.5.md +++ b/ChangeLog-8.5.md @@ -2,6 +2,12 @@ All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [8.5.11] - 2020-11-27 + +### Changed + +* Bumped required version of `phpunit/php-code-coverage` + ## [8.5.10] - 2020-11-27 ### Added @@ -94,6 +100,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable` * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside +[8.5.11]: https://github.com/sebastianbergmann/phpunit/compare/8.5.10...8.5.11 [8.5.10]: https://github.com/sebastianbergmann/phpunit/compare/8.5.9...8.5.10 [8.5.9]: https://github.com/sebastianbergmann/phpunit/compare/8.5.8...8.5.9 [8.5.8]: https://github.com/sebastianbergmann/phpunit/compare/8.5.7...8.5.8 diff --git a/composer.json b/composer.json index 5c3b7a9a170..2d70f264e07 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "phar-io/manifest": "^1.0.3", "phar-io/version": "^2.0.1", "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.11", + "phpunit/php-code-coverage": "^7.0.12", "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.1.2", diff --git a/src/Runner/Version.php b/src/Runner/Version.php index 61356c49d62..e42b8b1471c 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -33,7 +33,7 @@ public static function id(): string } if (self::$version === '') { - self::$version = (new VersionId('8.5.10', \dirname(__DIR__, 2)))->getVersion(); + self::$version = (new VersionId('8.5.11', \dirname(__DIR__, 2)))->getVersion(); } return self::$version; From 098648fab4bbfbbca3f1f96b7e23c3212dc9ab29 Mon Sep 17 00:00:00 2001 From: Stefano Arlandini Date: Sat, 28 Nov 2020 02:22:17 +0100 Subject: [PATCH 2/3] Disable Xdebug 2.x debug mode when collecting the code coverage --- src/Runner/PhptTestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php index 966ba074bce..958f70b3c82 100644 --- a/src/Runner/PhptTestCase.php +++ b/src/Runner/PhptTestCase.php @@ -772,10 +772,10 @@ private function settings(bool $collectCoverage): array $settings[] = 'xdebug.mode=off'; } } else { + $settings[] = 'xdebug.default_enable=0'; + if ($collectCoverage) { $settings[] = 'xdebug.coverage_enable=1'; - } else { - $settings[] = 'xdebug.default_enable=0'; } } } From 0de14860b0e3fa13b963bdaaeaee1daa436cd9fe Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sat, 28 Nov 2020 03:23:13 +0100 Subject: [PATCH 3/3] Update ChangeLog --- ChangeLog-8.5.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md index 6e03b78c0d7..e53a24fc185 100644 --- a/ChangeLog-8.5.md +++ b/ChangeLog-8.5.md @@ -2,6 +2,12 @@ All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [8.5.12] - 2020-MM-DD + +### Fixed + +* [#4529](https://github.com/sebastianbergmann/phpunit/issues/4529): Debug mode of Xdebug 2 is not disabled for PHPT tests + ## [8.5.11] - 2020-11-27 ### Changed @@ -100,6 +106,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable` * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside +[8.5.12]: https://github.com/sebastianbergmann/phpunit/compare/8.5.11...8.5 [8.5.11]: https://github.com/sebastianbergmann/phpunit/compare/8.5.10...8.5.11 [8.5.10]: https://github.com/sebastianbergmann/phpunit/compare/8.5.9...8.5.10 [8.5.9]: https://github.com/sebastianbergmann/phpunit/compare/8.5.8...8.5.9