Consider child classes of child classes for ClassesThatExtendClass target

Author: sebastianbergmann

ChangeLog-12.1.md

@@ -2,10 +2,17 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [12.1.1] - 2025-MM-DD
+
+### Fixed
+
+* Child classes of child classes are not considered for `ClassesThatExtendClass` target
+
 ## [12.1.0] - 2025-03-17
 
 ### Changed
 
 * `CacheWarmer::warmCache()` now returns the number of cache hits and cache misses
 
+[12.1.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/12.1.0...main
 [12.1.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/12.0.5...12.1.0

src/Target/MapBuilder.php

@@ -40,9 +40,13 @@
      */
     public function build(Filter $filter, FileAnalyser $analyser): array
     {
+        /**
+         * @var array<non-empty-string, Class_> $classDetails
+         */
+        $classDetails = [];
+
         $namespaces                    = [];
         $classes                       = [];
-        $classDetails                  = [];
         $classesThatExtendClass        = [];
         $classesThatImplementInterface = [];
         $traits                        = [];
@@ -122,7 +126,7 @@ public function build(Filter $filter, FileAnalyser $analyser): array
                 $this->processMethods($class, $file, $methods, $reverseLookup);
 
                 $classesThatExtendClass[$class->namespacedName()] = [];
-                $classDetails[]                                   = $class;
+                $classDetails[$class->namespacedName()]           = $class;
             }
 
             foreach ($analyser->functionsIn($file) as $function) {
@@ -153,19 +157,15 @@ public function build(Filter $filter, FileAnalyser $analyser): array
                 $this->process($classesThatImplementInterface, $interfaceName, $class->file(), $class->startLine(), $class->endLine());
             }
 
-            if (!$class->hasParent()) {
-                continue;
-            }
-
-            if (isset($classes[$class->parentClass()])) {
+            foreach ($this->parentClasses($classDetails, $class) as $parentClass) {
                 $classes[$class->namespacedName()] = array_merge_recursive(
                     $classes[$class->namespacedName()],
-                    $classes[$class->parentClass()],
+                    $classes[$parentClass->namespacedName()],
                 );
-            }
 
-            if (isset($classesThatExtendClass[$class->parentClass()])) {
-                $this->process($classesThatExtendClass, $class->parentClass(), $class->file(), $class->startLine(), $class->endLine());
+                if (isset($classesThatExtendClass[$parentClass->namespacedName()])) {
+                    $this->process($classesThatExtendClass, $parentClass->namespacedName(), $class->file(), $class->startLine(), $class->endLine());
+                }
             }
         }
 
@@ -185,6 +185,15 @@ public function build(Filter $filter, FileAnalyser $analyser): array
             unset($classesThatExtendClass[$className]);
         }
 
+        /**
+         * @todo Avoid duplication and remove this loop
+         */
+        foreach (array_keys($classes) as $className) {
+            foreach (array_keys($classes[$className]) as $file) {
+                $classes[$className][$file] = array_unique($classes[$className][$file]);
+            }
+        }
+
         return [
             'namespaces'                    => $namespaces,
             'traits'                        => $traits,
@@ -252,4 +261,25 @@ private function process(array &$data, string $unit, string $file, int $startLin
             range($startLine, $endLine),
         );
     }
+
+    /**
+     * @param array<non-empty-string, Class_> $classDetails
+     *
+     * @return array<Class_>
+     */
+    private function parentClasses(array $classDetails, Class_ $class): array
+    {
+        if (!$class->hasParent()) {
+            return [];
+        }
+
+        if (!isset($classDetails[$class->parentClass()])) {
+            return [];
+        }
+
+        return array_merge(
+            [$classDetails[$class->parentClass()]],
+            $this->parentClasses($classDetails, $classDetails[$class->parentClass()]),
+        );
+    }
 }

tests/tests/Target/MapBuilderTest.php

@@ -375,6 +375,7 @@ public static function provider(): array
                     'classesThatExtendClass' => [
                         GrandParentClass::class => [
                             $parentClass => range(4, 9),
+                            $childClass  => range(4, 9),
                         ],
                         ParentClass::class => [
                             $childClass => range(4, 9),

tests/tests/Target/MapperTest.php

@@ -22,6 +22,7 @@
 use PHPUnit\Framework\TestCase;
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\StaticAnalysis\ParsingFileAnalyser;
+use SebastianBergmann\CodeCoverage\TestFixture\Target\GrandParentClass;
 use SebastianBergmann\CodeCoverage\TestFixture\Target\Issue1066\DummyWithTrait;
 use SebastianBergmann\CodeCoverage\TestFixture\Target\TargetClass;
 use SebastianBergmann\CodeCoverage\TestFixture\Target\TargetEnumeration;
@@ -70,7 +71,7 @@ public static function provider(): array
                 ),
             ],
 
-            'classes that extend class' => [
+            'classes that extend class (parent and child)' => [
                 [
                     $file => range(33, 52),
                 ],
@@ -81,6 +82,20 @@ public static function provider(): array
                 ),
             ],
 
+            'classes that extend class (grand parent, parent, and child)' => [
+                [
+                    realpath(__DIR__ . '/../../_files/Target/GrandParentClass.php') => range(4, 9),
+                    realpath(__DIR__ . '/../../_files/Target/ParentClass.php')      => range(4, 9),
+                    realpath(__DIR__ . '/../../_files/Target/ChildClass.php')       => range(4, 9),
+                ],
+                TargetCollection::fromArray(
+                    [
+                        Target::forClass(GrandParentClass::class),
+                        Target::forClassesThatExtendClass(GrandParentClass::class),
+                    ],
+                ),
+            ],
+
             'classes that implement interface' => [
                 [
                     $file => range(26, 31),