Skip to content

Commit

Permalink
Closes #4650
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed May 17, 2021
1 parent aa71c73 commit 07a022a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions ChangeLog-10.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes of the PHPUnit 10.0 release series are documented in this fi
### Added

* [#4502](https://github.com/sebastianbergmann/phpunit/issues/4502): Support PHP 8 attributes for adding metadata to test classes and test methods as well as tested code units
* [#4650](https://github.com/sebastianbergmann/phpunit/issues/4650): Support dist file name `phpunit.dist.xml`
* `@excludeGlobalVariableFromBackup variable` annotation for excluding a global variable from the backup/restore of global and super-global variables
* `#[ExcludeGlobalVariableFromBackup('variable')]` attribute for excluding a global variable from the backup/restore of global and super-global variables
* `@excludeStaticPropertyFromBackup className propertyName` annotation for excluding a static property from the backup/restore of static properties in user-defined classes
Expand Down
1 change: 1 addition & 0 deletions src/TextUI/Command.php
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,7 @@ private function configurationFileInDirectory(string $directory): ?string
{
$candidates = [
$directory . '/phpunit.xml',
$directory . '/phpunit.dist.xml',
$directory . '/phpunit.xml.dist',
];

Expand Down

0 comments on commit 07a022a

Please sign in to comment.