Merge branch '9.4' into master

sebastianbergmann · Nov 28, 2020 · d86b1ee · d86b1ee
2 parents 894c91e + 8fb6b97
commit d86b1ee
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
@@ -2,6 +2,18 @@
 
 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
+
+* Bumped required version of `phpunit/php-code-coverage`
+
 ## [8.5.10] - 2020-11-27
 
 ### Added
@@ -94,6 +106,8 @@ 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
 [8.5.8]: https://github.com/sebastianbergmann/phpunit/compare/8.5.7...8.5.8

diff --git a/ChangeLog-9.4.md b/ChangeLog-9.4.md
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 9.4 release series are documented in this fil
 ### Fixed
 
 * [#4489](https://github.com/sebastianbergmann/phpunit/issues/4489): Numeric group names are not handled correctly
+* [#4529](https://github.com/sebastianbergmann/phpunit/issues/4529): Debug mode of Xdebug 2 is not disabled for PHPT tests
 
 ## [9.4.3] - 2020-11-10
 

diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -851,10 +851,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';
                 }
             }
         }