We no longer need to look for code coverage target metadata on test m…

…ethods
sebastianbergmann · Feb 27, 2024 · e817f3d · e817f3d
1 parent f2347f1
commit e817f3d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/Framework/TestRunner.php b/src/Framework/TestRunner.php
@@ -156,7 +156,6 @@ public function run(TestCase $test): void
 
                     $linesToBeUsed = (new CodeCoverageMetadataApi)->linesToBeUsed(
                         $test::class,
-                        $test->name(),
                     );
                 } catch (InvalidCoversTargetException $cce) {
                     Event\Facade::emitter()->testTriggeredPhpunitWarning(

diff --git a/src/Metadata/Api/CodeCoverage.php b/src/Metadata/Api/CodeCoverage.php
@@ -47,7 +47,7 @@ public function linesToBeCovered(string $className, string $methodName): array|f
         $codeUnits = CodeUnitCollection::fromList();
         $mapper    = new Mapper;
 
-        foreach (Registry::parser()->forClassAndMethod($className, $methodName) as $metadata) {
+        foreach (Registry::parser()->forClass($className) as $metadata) {
             if (!$metadata->isCoversClass() && !$metadata->isCoversMethod() && !$metadata->isCoversFunction()) {
                 continue;
             }
@@ -64,18 +64,17 @@ public function linesToBeCovered(string $className, string $methodName): array|f
 
     /**
      * @psalm-param class-string $className
-     * @psalm-param non-empty-string $methodName
      *
      * @psalm-return array<string,list<int>>
      *
      * @throws CodeCoverageException
      */
-    public function linesToBeUsed(string $className, string $methodName): array
+    public function linesToBeUsed(string $className): array
     {
         $codeUnits = CodeUnitCollection::fromList();
         $mapper    = new Mapper;
 
-        foreach (Registry::parser()->forClassAndMethod($className, $methodName) as $metadata) {
+        foreach (Registry::parser()->forClass($className) as $metadata) {
             if (!$metadata->isUsesClass() && !$metadata->isUsesMethod() && !$metadata->isUsesFunction()) {
                 continue;
             }

diff --git a/tests/unit/Metadata/Api/CodeCoverageTest.php b/tests/unit/Metadata/Api/CodeCoverageTest.php
@@ -180,13 +180,12 @@ public function testLinesToBeCoveredCanBeDetermined(array|false $expected, strin
      * @psalm-param class-string $className
      */
     #[DataProvider('linesToBeUsedProvider')]
-    public function testLinesToBeUsedCanBeDetermined(array|false $expected, string $className, string $methodName): void
+    public function testLinesToBeUsedCanBeDetermined(array|false $expected, string $className): void
     {
         $this->assertEqualsCanonicalizing(
             $expected,
             (new CodeCoverage)->linesToBeUsed(
                 $className,
-                $methodName,
             ),
         );
     }
@@ -225,7 +224,7 @@ public function testRejectsInterfaceAsUsesClassTargetWithAttribute(): void
         $this->expectException(CodeCoverageException::class);
         $this->expectExceptionMessage('Interface "Throwable" is not a valid target for code coverage');
 
-        (new CodeCoverage)->linesToBeUsed(InterfaceAsTargetWithAttributeTest::class, 'testOne');
+        (new CodeCoverage)->linesToBeUsed(InterfaceAsTargetWithAttributeTest::class);
     }
 
     public function testRejectsInvalidCoversClassTargetWithAttribute(): void
@@ -241,7 +240,7 @@ public function testRejectsInvalidUsesClassTargetWithAttribute(): void
         $this->expectException(CodeCoverageException::class);
         $this->expectExceptionMessage('Class "InvalidClass" is not a valid target for code coverage');
 
-        (new CodeCoverage)->linesToBeUsed(InvalidClassTargetWithAttributeTest::class, 'testOne');
+        (new CodeCoverage)->linesToBeUsed(InvalidClassTargetWithAttributeTest::class);
     }
 
     public function testRejectsInvalidCoversClassTargetWithAnnotation(): void
@@ -257,7 +256,7 @@ public function testRejectsInvalidUsesClassTargetWithAnnotation(): void
         $this->expectException(CodeCoverageException::class);
         $this->expectExceptionMessage('Class "InvalidClass" is not a valid target for code coverage');
 
-        (new CodeCoverage)->linesToBeUsed(InvalidClassTargetWithAnnotationTest::class, 'testOne');
+        (new CodeCoverage)->linesToBeUsed(InvalidClassTargetWithAnnotationTest::class);
     }
 
     public function testRejectsInvalidCoversFunctionTarget(): void
@@ -273,6 +272,6 @@ public function testRejectsInvalidUsesFunctionTarget(): void
         $this->expectException(CodeCoverageException::class);
         $this->expectExceptionMessage('Function "::invalid_function" is not a valid target for code coverage');
 
-        (new CodeCoverage)->linesToBeUsed(InvalidFunctionTargetTest::class, 'testOne');
+        (new CodeCoverage)->linesToBeUsed(InvalidFunctionTargetTest::class);
     }
 }