Merge branch '9.5'

sebastianbergmann · Jun 4, 2021 · 7725ea1 · 7725ea1
2 parents 31b50f0 + 64830a4
commit 7725ea1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
@@ -12,6 +12,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 
 * [#4663](https://github.com/sebastianbergmann/phpunit/issues/4663): `TestCase::expectError()` works on PHP 7.3, but not on PHP >= 7.4
 * [#4678](https://github.com/sebastianbergmann/phpunit/pull/4678): Stubbed methods with `iterable` return types should return empty array by default
+* [#4692](https://github.com/sebastianbergmann/phpunit/issues/4692): Annotations in single-line doc-comments are not handled correctly
 
 ## [8.5.15] - 2021-03-17
 

diff --git a/ChangeLog-9.5.md b/ChangeLog-9.5.md
@@ -12,6 +12,7 @@ All notable changes of the PHPUnit 9.5 release series are documented in this fil
 
 * [#4632](https://github.com/sebastianbergmann/phpunit/issues/4632): TestDox result printer does not handle repeated test execution correctly
 * [#4678](https://github.com/sebastianbergmann/phpunit/pull/4678): Stubbed methods with `iterable` return types should return empty array by default
+* [#4692](https://github.com/sebastianbergmann/phpunit/issues/4692): Annotations in single-line doc-comments are not handled correctly
 
 ## [9.5.4] - 2021-03-23