Move method

Author: sebastianbergmann

src/Framework/TestSuite.php

@@ -106,7 +106,7 @@ public static function fromClassReflector(ReflectionClass $class, array $groups
                 continue;
             }
 
-            if (TestUtil::isHookMethod($method)) {
+            if ((new HookMethods)->isHookMethod($method)) {
                 Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
                     sprintf(
                         'Method %s::%s() cannot be used both as a hook method and as a test method',

src/Metadata/Api/HookMethods.php

@@ -11,6 +11,8 @@
 
 use function assert;
 use function class_exists;
+use function in_array;
+use function strtolower;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Metadata\After;
 use PHPUnit\Metadata\AfterClass;
@@ -23,6 +25,7 @@
 use PHPUnit\Runner\HookMethodCollection;
 use PHPUnit\Util\Reflection;
 use ReflectionClass;
+use ReflectionMethod;
 
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -117,6 +120,31 @@ public function hookMethods(string $className): array
         return self::$hookMethods[$className];
     }
 
+    public function isHookMethod(ReflectionMethod $method): bool
+    {
+        $defaultNames = [
+            'setupbeforeclass',
+            'setup',
+            'assertpreconditions',
+            'assertpostconditions',
+            'teardown',
+            'teardownafterclass',
+        ];
+
+        if (in_array(strtolower($method->getName()), $defaultNames, true)) {
+            return true;
+        }
+
+        $metadata = Registry::parser()->forMethod($method->getDeclaringClass()->getName(), $method->getName());
+
+        return $metadata->isBeforeClass()->isNotEmpty() ||
+            $metadata->isBefore()->isNotEmpty() ||
+            $metadata->isPreCondition()->isNotEmpty() ||
+            $metadata->isPostCondition()->isNotEmpty() ||
+            $metadata->isAfter()->isNotEmpty() ||
+            $metadata->isAfterClass()->isNotEmpty();
+    }
+
     /**
      * @return array{beforeClass: HookMethodCollection, before: HookMethodCollection, preCondition: HookMethodCollection, postCondition: HookMethodCollection, after: HookMethodCollection, afterClass: HookMethodCollection}
      */

src/Util/Test.php

@@ -12,9 +12,7 @@
 use const DEBUG_BACKTRACE_IGNORE_ARGS;
 use const DEBUG_BACKTRACE_PROVIDE_OBJECT;
 use function debug_backtrace;
-use function in_array;
 use function str_starts_with;
-use function strtolower;
 use PHPUnit\Event\Code\NoTestCaseObjectOnCallStackException;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Metadata\Parser\Registry;
@@ -58,29 +56,4 @@ public static function isTestMethod(ReflectionMethod $method): bool
 
         return $metadata->isTest()->isNotEmpty();
     }
-
-    public static function isHookMethod(ReflectionMethod $method): bool
-    {
-        $defaultNames = [
-            'setupbeforeclass',
-            'setup',
-            'assertpreconditions',
-            'assertpostconditions',
-            'teardown',
-            'teardownafterclass',
-        ];
-
-        if (in_array(strtolower($method->getName()), $defaultNames, true)) {
-            return true;
-        }
-
-        $metadata = Registry::parser()->forMethod($method->getDeclaringClass()->getName(), $method->getName());
-
-        return $metadata->isBeforeClass()->isNotEmpty() ||
-               $metadata->isBefore()->isNotEmpty() ||
-               $metadata->isPreCondition()->isNotEmpty() ||
-               $metadata->isPostCondition()->isNotEmpty() ||
-               $metadata->isAfter()->isNotEmpty() ||
-               $metadata->isAfterClass()->isNotEmpty();
-    }
 }