Closes #5733

Author: sebastianbergmann

ChangeLog-11.1.md

@@ -9,6 +9,7 @@ All notable changes of the PHPUnit 11.1 release series are documented in this fi
 * [#5175](https://github.com/sebastianbergmann/phpunit/issues/5175): `#[CoversMethod]` and `#[UsesMethod]` attributes for more fine-grained code coverage targeting
 * [#5696](https://github.com/sebastianbergmann/phpunit/pull/5696): `#[DisableReturnValueGenerationForTestDoubles]` attribute for disabling return value generation for test doubles created using `createMock()`, `createMockForIntersectionOfInterfaces()`, `createPartialMock()`, `createStub()`, and `createStubForIntersectionOfInterfaces()`
 * [#5720](https://github.com/sebastianbergmann/phpunit/issues/5720): Support filtering using `--filter`, `--exclude-filter`, `--group`, and `--exclude-group` when listing tests using `--list-tests` and `--list-tests-xml` as well as listing groups with `--list-groups`
+* [#5733](https://github.com/sebastianbergmann/phpunit/issues/5733): Implicitly include (abstract) parent class(es) with `#[CoversClass]` and `#[UsesClass]` attributes
 * `--only-summary-for-coverage-text` CLI option to reduce the code coverage report in text format to a summary
 * `--show-uncovered-for-coverage-text` CLI option to expand the code coverage report in text format to include a list of uncovered files
 

src/Metadata/Api/CodeCoverage.php

@@ -27,6 +27,8 @@
 use PHPUnit\Metadata\UsesDefaultClass;
 use PHPUnit\Metadata\UsesFunction;
 use PHPUnit\Metadata\UsesMethod;
+use ReflectionClass;
+use ReflectionException;
 use SebastianBergmann\CodeUnit\CodeUnitCollection;
 use SebastianBergmann\CodeUnit\Exception as CodeUnitException;
 use SebastianBergmann\CodeUnit\InvalidCodeUnitException;
@@ -220,9 +222,39 @@ public function shouldCodeCoverageBeCollectedFor(string $className, string $meth
     private function mapToCodeUnits(CoversClass|CoversFunction|CoversMethod|UsesClass|UsesFunction|UsesMethod $metadata): CodeUnitCollection
     {
         $mapper = new Mapper;
+        $names  = [$metadata->asStringForCodeUnitMapper()];
+
+        if ($metadata->isCoversClass() || $metadata->isUsesClass()) {
+            try {
+                $reflector = new ReflectionClass($metadata->asStringForCodeUnitMapper());
+            } catch (ReflectionException $e) {
+                throw new InvalidCoversTargetException(
+                    sprintf(
+                        'Class "%s" is not a valid target for code coverage',
+                        $metadata->asStringForCodeUnitMapper(),
+                    ),
+                    $e->getCode(),
+                    $e,
+                );
+            }
+
+            while ($reflector = $reflector->getParentClass()) {
+                if (!$reflector->isUserDefined()) {
+                    break;
+                }
+
+                $names[] = $reflector->getName();
+            }
+        }
+
+        $codeUnits = CodeUnitCollection::fromList();
 
         try {
-            return $mapper->stringToCodeUnits($metadata->asStringForCodeUnitMapper());
+            foreach ($names as $name) {
+                $codeUnits = $codeUnits->mergeWith(
+                    $mapper->stringToCodeUnits($name),
+                );
+            }
         } catch (CodeUnitException $e) {
             if ($metadata->isCoversClass() || $metadata->isUsesClass()) {
                 if (interface_exists($metadata->className())) {
@@ -244,5 +276,7 @@ private function mapToCodeUnits(CoversClass|CoversFunction|CoversMethod|UsesClas
                 $e,
             );
         }
+
+        return $codeUnits;
     }
 }

tests/unit/Metadata/Api/CodeCoverageTest.php

@@ -63,7 +63,7 @@ public static function linesToBeCoveredProvider(): array
 
             [
                 [
-                    TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46),
+                    TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(12, 27), range(29, 46)),
                 ],
                 CoverageClassTest::class,
                 'testSomething',
@@ -220,7 +220,7 @@ public static function linesToBeUsedProvider(): array
 
             [
                 [
-                    TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46),
+                    TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(12, 27), range(29, 46)),
                 ],
                 CoverageClassTest::class,
                 'testSomething',