Revert deprecation of targeting traits

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -4,6 +4,11 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 
 ## [11.5.4] - 2025-MM-DD
 
+### Changed
+
+* [#5958](https://github.com/sebastianbergmann/phpunit/issues/5958): Support for `#[CoversTrait]` and `#[UsesTrait]` attributes is no longer deprecated
+* [#5960](https://github.com/sebastianbergmann/phpunit/issues/5960): Support for targeting trait methods with the `#[CoversMethod]` and `#[UsesMethod]` attributes is no longer deprecated
+
 ### Fixed
 
 * [#6103](https://github.com/sebastianbergmann/phpunit/issues/6103): Output from test run in separate process is printed twice

DEPRECATIONS.md

@@ -59,7 +59,6 @@ This functionality is currently [hard-deprecated](https://phpunit.de/backward-co
 | [#5216](https://github.com/sebastianbergmann/phpunit/issues/5216) | `TestCase::setLocale()`                                     | 10.3.0 |                                                                                         |
 | [#5800](https://github.com/sebastianbergmann/phpunit/issues/5800) | Targeting traits with `#[CoversClass]` and `#[UsesClass]`   | 11.2.0 | `#[CoversClass]` and `#[UsesClass]` also target the traits used by the targeted classes |
 | [#5951](https://github.com/sebastianbergmann/phpunit/issues/5951) | `includeUncoveredFiles` configuration option                | 11.4.0 |                                                                                         |
-| [#5958](https://github.com/sebastianbergmann/phpunit/issues/5958) | `#[CoversTrait]` and `#[UsesTrait]` attributes              | 11.4.0 | `#[CoversClass]` and `#[UsesClass]` also target the traits used by the targeted classes |
 | [#5960](https://github.com/sebastianbergmann/phpunit/issues/5960) | Targeting traits with `#[CoversMethod]` and `#[UsesMethod]` | 11.4.0 |                                                                                         |
 
 ## Soft Deprecations

src/Framework/Attributes/CoversTrait.php

@@ -15,8 +15,6 @@
  * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
- *
- * @deprecated
  */
 #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
 final readonly class CoversTrait

src/Framework/Attributes/UsesTrait.php

@@ -15,8 +15,6 @@
  * @immutable
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
- *
- * @deprecated
  */
 #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
 final readonly class UsesTrait

src/Metadata/Api/CodeCoverage.php

@@ -16,7 +16,6 @@
 use function sprintf;
 use function str_starts_with;
 use function trait_exists;
-use PHPUnit\Event\Facade as EventFacade;
 use PHPUnit\Framework\CodeCoverageException;
 use PHPUnit\Framework\InvalidCoversTargetException;
 use PHPUnit\Metadata\Covers;
@@ -273,42 +272,6 @@ private function names(CoversClass|CoversFunction|CoversMethod|CoversTrait|UsesC
         $name  = $metadata->asStringForCodeUnitMapper();
         $names = [$name];
 
-        if ($metadata->isCoversTrait()) {
-            EventFacade::emitter()->testRunnerTriggeredDeprecation(
-                sprintf(
-                    'Targeting a trait such as %s with #[CoversTrait] is deprecated. The traits used by the class(es) you target with #[CoversClass] will be targeted as well.',
-                    $names[0],
-                ),
-            );
-        }
-
-        if ($metadata->isUsesTrait()) {
-            EventFacade::emitter()->testRunnerTriggeredDeprecation(
-                sprintf(
-                    'Targeting a trait such as %s with #[UsesTrait] is deprecated. The traits used by the class(es) you target with #[UsesClass] will be targeted as well.',
-                    $names[0],
-                ),
-            );
-        }
-
-        if ($metadata->isCoversMethod() && trait_exists($metadata->className())) {
-            EventFacade::emitter()->testRunnerTriggeredDeprecation(
-                sprintf(
-                    'Targeting a trait such as %s with #[CoversMethod] is deprecated.',
-                    $metadata->className(),
-                ),
-            );
-        }
-
-        if ($metadata->isUsesMethod() && trait_exists($metadata->className())) {
-            EventFacade::emitter()->testRunnerTriggeredDeprecation(
-                sprintf(
-                    'Targeting a trait such as %s with #[UsesMethod] is deprecated.',
-                    $metadata->className(),
-                ),
-            );
-        }
-
         if ($metadata->isCoversClass() || $metadata->isUsesClass()) {
             if (isset($this->withParents[$name])) {
                 return $this->withParents[$name];
@@ -334,24 +297,6 @@ private function names(CoversClass|CoversFunction|CoversMethod|CoversTrait|UsesC
 
             assert(class_exists($names[0]) || trait_exists($names[0]));
 
-            if ($metadata->isCoversClass() && trait_exists($names[0])) {
-                EventFacade::emitter()->testRunnerTriggeredDeprecation(
-                    sprintf(
-                        'Targeting a trait such as %s with #[CoversClass] is deprecated. The traits used by the class(es) you target with #[CoversClass] will be targeted as well.',
-                        $names[0],
-                    ),
-                );
-            }
-
-            if ($metadata->isUsesClass() && trait_exists($names[0])) {
-                EventFacade::emitter()->testRunnerTriggeredDeprecation(
-                    sprintf(
-                        'Targeting a trait such as %s with #[UsesClass] is deprecated.  The traits used by the class(es) you target with #[UsesClass] will be targeted as well.',
-                        $names[0],
-                    ),
-                );
-            }
-
             $reflector = new ReflectionClass($name);
 
             while ($reflector = $reflector->getParentClass()) {