Refactor

Author: sebastianbergmann

.psalm/baseline.xml

@@ -1183,7 +1183,7 @@
       <code>doesNotPerformAssertions</code>
       <code>doesNotPerformAssertions</code>
       <code>getActualOutput</code>
-      <code>getAnnotations</code>
+      <code>getName</code>
       <code>getName</code>
       <code>getNumAssertions</code>
       <code>getNumAssertions</code>
@@ -2029,10 +2029,11 @@
     <MissingReturnType occurrences="1">
       <code>sanitizeVersionNumber</code>
     </MissingReturnType>
-    <MissingThrowsDocblock occurrences="5">
+    <MissingThrowsDocblock occurrences="6">
       <code>forClassName</code>
       <code>forMethod</code>
       <code>forMethod</code>
+      <code>getName</code>
       <code>requirements</code>
       <code>requirements</code>
     </MissingThrowsDocblock>

src/Framework/TestCase.php

@@ -936,17 +936,6 @@ public function setGroups(array $groups): void
         $this->groups = $groups;
     }
 
-    /**
-     * @internal This method is not covered by the backward compatibility promise for PHPUnit
-     */
-    public function getAnnotations(): array
-    {
-        return TestUtil::parseTestMethodAnnotations(
-            static::class,
-            $this->name
-        );
-    }
-
     /**
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
@@ -2449,7 +2438,10 @@ private function registerMockObjectsFromTestArguments(array $testArguments, arra
 
     private function setDoesNotPerformAssertionsFromAnnotation(): void
     {
-        $annotations = $this->getAnnotations();
+        $annotations = TestUtil::parseTestMethodAnnotations(
+            static::class,
+            $this->name
+        );
 
         if (isset($annotations['method']['doesNotPerformAssertions'])) {
             $this->doesNotPerformAssertions = true;

src/Framework/TestResult.php

@@ -811,7 +811,10 @@ function_exists('xdebug_start_function_monitor');
         }
 
         if ($this->forceCoversAnnotation && !$error && !$failure && !$warning && !$incomplete && !$skipped && !$risky) {
-            $annotations = $test->getAnnotations();
+            $annotations = TestUtil::parseTestMethodAnnotations(
+                get_class($test),
+                $test->getName(false)
+            );
 
             if (!isset($annotations['class']['covers']) &&
                 !isset($annotations['method']['covers']) &&
@@ -957,7 +960,10 @@ function_exists('xdebug_start_function_monitor');
                 $time
             );
         } elseif ($this->beStrictAboutTodoAnnotatedTests && $test instanceof TestCase) {
-            $annotations = $test->getAnnotations();
+            $annotations = TestUtil::parseTestMethodAnnotations(
+                get_class($test),
+                $test->getName(false)
+            );
 
             if (isset($annotations['method']['todo'])) {
                 $this->addFailure(

src/Util/Test.php

@@ -142,7 +142,10 @@ public static function getLinesToBeUsed(string $className, string $methodName):
 
     public static function requiresCodeCoverageDataCollection(TestCase $test): bool
     {
-        $annotations = $test->getAnnotations();
+        $annotations = self::parseTestMethodAnnotations(
+            get_class($test),
+            $test->getName(false)
+        );
 
         // If there is no @covers annotation but a @coversNothing annotation on
         // the test method then code coverage data does not need to be collected

src/Util/TestDox/NamePrettifier.php

@@ -140,7 +140,11 @@ public function prettifyTestClass(string $className): string
      */
     public function prettifyTestCase(TestCase $test): string
     {
-        $annotations                = $test->getAnnotations();
+        $annotations = Test::parseTestMethodAnnotations(
+            get_class($test),
+            $test->getName(false)
+        );
+
         $annotationWithPlaceholders = false;
 
         $callback = static function (string $variable): string {

src/Util/TestDox/XmlResultPrinter.php

@@ -23,6 +23,7 @@
 use PHPUnit\Framework\TestSuite;
 use PHPUnit\Framework\Warning;
 use PHPUnit\Util\Printer;
+use PHPUnit\Util\Test as TestUtil;
 use ReflectionClass;
 use ReflectionException;
 use Throwable;
@@ -183,7 +184,10 @@ static function ($group) {
             $testNode->appendChild($groupNode);
         }
 
-        $annotations = $test->getAnnotations();
+        $annotations = TestUtil::parseTestMethodAnnotations(
+            get_class($test),
+            $test->getName(false)
+        );
 
         foreach (['class', 'method'] as $type) {
             foreach ($annotations[$type] as $annotation => $values) {