Merge branch '11.5' into 12.1

Author: sebastianbergmann

ChangeLog-12.1.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 12.1 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [12.1.5] - 2025-MM-DD
+
+### Fixed
+
+* [#6199](https://github.com/sebastianbergmann/phpunit/issues/6199): `assertEmpty()` and `assertNotEmpty()` use overly restrictive `phpstan-assert empty` directives
+
 ## [12.1.4] - 2025-05-02
 
 ### Added
@@ -60,6 +66,7 @@ All notable changes of the PHPUnit 12.1 release series are documented in this fi
 
 * [#6140](https://github.com/sebastianbergmann/phpunit/issues/6140): The `testClassName()` method on the `AfterTestMethodCalled`, `AfterTestMethodErrored`, `AfterTestMethodFinished`, `BeforeTestMethodCalled`, `BeforeTestMethodErrored`, `BeforeTestMethodFinished`, `PostConditionCalled`, `PostConditionErrored`, `PostConditionFinished`, `PreConditionCalled`, `PreConditionErrored`, and `PreConditionFinished` event value objects (use `test()->className()` instead)
 
+[12.1.5]: https://github.com/sebastianbergmann/phpunit/compare/12.1.4...12.1
 [12.1.4]: https://github.com/sebastianbergmann/phpunit/compare/12.1.3...12.1.4
 [12.1.3]: https://github.com/sebastianbergmann/phpunit/compare/12.1.2...12.1.3
 [12.1.2]: https://github.com/sebastianbergmann/phpunit/compare/12.1.1...12.1.2

src/Framework/Assert.php

@@ -1150,8 +1150,6 @@ final public static function assertObjectNotEquals(object $expected, object $act
      *
      * @throws ExpectationFailedException
      * @throws GeneratorNotSupportedException
-     *
-     * @phpstan-assert empty $actual
      */
     final public static function assertEmpty(mixed $actual, string $message = ''): void
     {
@@ -1167,8 +1165,6 @@ final public static function assertEmpty(mixed $actual, string $message = ''): v
      *
      * @throws ExpectationFailedException
      * @throws GeneratorNotSupportedException
-     *
-     * @phpstan-assert !empty $actual
      */
     final public static function assertNotEmpty(mixed $actual, string $message = ''): void
     {

src/Framework/Assert/Functions.php

@@ -1056,8 +1056,6 @@ function assertObjectNotEquals(object $expected, object $actual, string $method
      * @throws ExpectationFailedException
      * @throws GeneratorNotSupportedException
      *
-     * @phpstan-assert empty $actual
-     *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
      * @see Assert::assertEmpty
@@ -1075,8 +1073,6 @@ function assertEmpty(mixed $actual, string $message = ''): void
      * @throws ExpectationFailedException
      * @throws GeneratorNotSupportedException
      *
-     * @phpstan-assert !empty $actual
-     *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
      * @see Assert::assertNotEmpty