Skip to content

Commit d86b1ee

Browse files
Merge branch '9.4' into master
2 parents 894c91e + 8fb6b97 commit d86b1ee

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

ChangeLog-8.5.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
44

5+
## [8.5.12] - 2020-MM-DD
6+
7+
### Fixed
8+
9+
* [#4529](https://github.com/sebastianbergmann/phpunit/issues/4529): Debug mode of Xdebug 2 is not disabled for PHPT tests
10+
11+
## [8.5.11] - 2020-11-27
12+
13+
### Changed
14+
15+
* Bumped required version of `phpunit/php-code-coverage`
16+
517
## [8.5.10] - 2020-11-27
618

719
### Added
@@ -94,6 +106,8 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
94106
* [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable`
95107
* [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside
96108

109+
[8.5.12]: https://github.com/sebastianbergmann/phpunit/compare/8.5.11...8.5
110+
[8.5.11]: https://github.com/sebastianbergmann/phpunit/compare/8.5.10...8.5.11
97111
[8.5.10]: https://github.com/sebastianbergmann/phpunit/compare/8.5.9...8.5.10
98112
[8.5.9]: https://github.com/sebastianbergmann/phpunit/compare/8.5.8...8.5.9
99113
[8.5.8]: https://github.com/sebastianbergmann/phpunit/compare/8.5.7...8.5.8

ChangeLog-9.4.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 9.4 release series are documented in this fil
77
### Fixed
88

99
* [#4489](https://github.com/sebastianbergmann/phpunit/issues/4489): Numeric group names are not handled correctly
10+
* [#4529](https://github.com/sebastianbergmann/phpunit/issues/4529): Debug mode of Xdebug 2 is not disabled for PHPT tests
1011

1112
## [9.4.3] - 2020-11-10
1213

src/Runner/PhptTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,10 +851,10 @@ private function settings(bool $collectCoverage): array
851851
$settings[] = 'xdebug.mode=off';
852852
}
853853
} else {
854+
$settings[] = 'xdebug.default_enable=0';
855+
854856
if ($collectCoverage) {
855857
$settings[] = 'xdebug.coverage_enable=1';
856-
} else {
857-
$settings[] = 'xdebug.default_enable=0';
858858
}
859859
}
860860
}

0 commit comments

Comments
 (0)