More work on mapping code coverage targets to source locations

sebastianbergmann · Oct 31, 2024 · eb097d1 · eb097d1
1 parent 9190e6f
commit eb097d1
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 5 deletions.
diff --git a/src/Target/Mapper.php b/src/Target/Mapper.php
@@ -71,11 +71,21 @@ private function mapTarget(Target $target): array
         if ($target->isClass()) {
             assert($target instanceof Class_);
 
-            if (!isset($this->map['classes'][$target->className()])) {
-                throw new InvalidCodeCoverageTargetException('Class ' . $target->className());
+            if (!isset($this->map['classes'][$target->asString()])) {
+                throw new InvalidCodeCoverageTargetException('Class ' . $target->asString());
             }
 
-            return $this->map['classes'][$target->className()];
+            return $this->map['classes'][$target->asString()];
+        }
+
+        if ($target->isMethod()) {
+            assert($target instanceof Method);
+
+            if (!isset($this->map['methods'][$target->asString()])) {
+                throw new InvalidCodeCoverageTargetException('Method ' . $target->asString());
+            }
+
+            return $this->map['methods'][$target->asString()];
         }
     }
 }
diff --git a/tests/tests/Target/MapperTest.php b/tests/tests/Target/MapperTest.php
@@ -10,6 +10,7 @@
 namespace SebastianBergmann\CodeCoverage\Test\Target;
 
 use function array_keys;
+use function array_merge;
 use function range;
 use function realpath;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -44,6 +45,29 @@ public static function provider(): array
                     ],
                 ),
             ],
+            [
+                'single method',
+                [
+                    $file => range(37, 39),
+                ],
+                TargetCollection::fromArray(
+                    [
+                        Target::forMethod('SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ChildClass', 'six'),
+                    ],
+                ),
+            ],
+            [
+                'multiple methods',
+                [
+                    $file => array_merge(range(37, 39), range(41, 43)),
+                ],
+                TargetCollection::fromArray(
+                    [
+                        Target::forMethod('SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ChildClass', 'six'),
+                        Target::forMethod('SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ChildClass', 'one'),
+                    ],
+                ),
+            ],
         ];
     }
 
@@ -55,10 +79,19 @@ public static function invalidProvider(): array
         return [
             [
                 'single class',
-                'Class SebastianBergmann\CodeCoverage\StaticAnalysis\ChildClass is not a valid target for code coverage',
+                'Class DoesNotExist is not a valid target for code coverage',
                 TargetCollection::fromArray(
                     [
-                        Target::forClass('SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ChildClass'),
+                        Target::forClass('DoesNotExist'),
+                    ],
+                ),
+            ],
+            [
+                'single method',
+                'Method DoesNotExist::doesNotExist is not a valid target for code coverage',
+                TargetCollection::fromArray(
+                    [
+                        Target::forMethod('DoesNotExist', 'doesNotExist'),
                     ],
                 ),
             ],