PHP 8 and PHPUnit 9.3 support

src/Actions/ValidatesConfiguration.php

@@ -6,8 +6,7 @@ namespace Pest\Actions;
 
 use Pest\Exceptions\AttributeNotSupportedYet;
 use Pest\Exceptions\FileOrFolderNotFound;
-use PHPUnit\TextUI\Configuration\Configuration;
-use PHPUnit\TextUI\Configuration\Registry;
+use PHPUnit\TextUI\XmlConfiguration\Loader;
 
 /**
  * @internal
@@ -30,9 +29,7 @@ final class ValidatesConfiguration
             throw new FileOrFolderNotFound('phpunit.xml');
         }
 
-        $configuration = Registry::getInstance()
-            ->get($arguments[self::CONFIGURATION_KEY])
-            ->phpunit();
+        $configuration = (new Loader())->load($arguments[self::CONFIGURATION_KEY])->phpunit();
 
         if ($configuration->processIsolation()) {
             throw new AttributeNotSupportedYet('processIsolation', 'true');

src/Factories/TestCaseFactory.php

@@ -157,8 +157,15 @@ final class TestCaseFactory
     }
 
     /**
-     * Makes a fully qualified class name
-     * from the given filename.
+     * Makes a fully qualified class name from the current filename.
+     */
+    public function getClassName(): string
+    {
+        return $this->makeClassFromFilename($this->filename);
+    }
+
+    /**
+     * Makes a fully qualified class name from the given filename.
      */
     public function makeClassFromFilename(string $filename): string
     {

src/PendingObjects/TestCall.php

@@ -9,6 +9,7 @@ use Pest\Factories\TestCaseFactory;
 use Pest\Support\Backtrace;
 use Pest\Support\NullClosure;
 use Pest\TestSuite;
+use PHPUnit\Framework\ExecutionOrderDependency;
 use SebastianBergmann\Exporter\Exporter;
 
 /**
@@ -91,6 +92,12 @@ final class TestCall
      */
     public function depends(string ...$tests): TestCall
     {
+        $className = $this->testCaseFactory->getClassName();
+
+        $tests = array_map(function (string $test) use ($className): ExecutionOrderDependency {
+            return ExecutionOrderDependency::createFromDependsAnnotation($className, $test);
+        }, $tests);
+
         $this->testCaseFactory
             ->factoryProxies
             ->add(Backtrace::file(), Backtrace::line(), 'setDependencies', [$tests]);

src/Support/Container.php

@@ -75,14 +75,15 @@ final class Container
             if ($constructor !== null) {
                 $params = array_map(
                     function (ReflectionParameter $param) use ($id) {
-                        $candidate = null;
+                        $candidate = Reflection::getParameterClassName($param);
 
-                        if ($param->getType() !== null && $param->getType()->isBuiltin()) {
-                            $candidate = $param->getName();
-                        } elseif ($param->getClass() !== null) {
-                            $candidate = $param->getClass()->getName();
-                        } else {
-                            throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));
+                        if ($candidate === null) {
+                            $type = $param->getType();
+                            if ($type !== null && $type->isBuiltin()) {
+                                $candidate = $param->getName();
+                            } else {
+                                throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));
+                            }
                         }
 
                         return $this->get($candidate);

src/Support/HigherOrderMessage.php

@@ -76,7 +76,7 @@ final class HigherOrderMessage
             Reflection::setPropertyValue($throwable, 'file', $this->filename);
             Reflection::setPropertyValue($throwable, 'line', $this->line);
 
-            if ($throwable->getMessage() === sprintf(self::UNDEFINED_METHOD, $this->methodName)) {
+            if ($throwable->getMessage() === self::getUndefinedMethodMessage($target, $this->methodName)) {
                 /** @var \ReflectionClass $reflection */
                 $reflection = new ReflectionClass($target);
                 /* @phpstan-ignore-next-line */
@@ -87,4 +87,13 @@ final class HigherOrderMessage
             throw $throwable;
         }
     }
+
+    private static function getUndefinedMethodMessage(object $target, string $methodName): string
+    {
+        if (\PHP_MAJOR_VERSION >= 8) {
+            return sprintf(sprintf(self::UNDEFINED_METHOD, sprintf('%s::%s()', get_class($target), $methodName)));
+        }
+
+        return sprintf(self::UNDEFINED_METHOD, $methodName);
+    }
 }

src/Support/Reflection.php

@@ -9,6 +9,8 @@ use Pest\Exceptions\ShouldNotHappen;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
+use ReflectionNamedType;
+use ReflectionParameter;
 use ReflectionProperty;
 
 /**
@@ -117,4 +119,32 @@ final class Reflection
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($object, $value);
     }
+
+    /**
+     * Get the class name of the given parameter's type, if possible.
+     *
+     * @see https://github.com/laravel/framework/blob/v6.18.25/src/Illuminate/Support/Reflector.php
+     */
+    public static function getParameterClassName(ReflectionParameter $parameter): ?string
+    {
+        $type = $parameter->getType();
+
+        if (!$type instanceof ReflectionNamedType || $type->isBuiltin()) {
+            return null;
+        }
+
+        $name = $type->getName();
+
+        if (($class = $parameter->getDeclaringClass()) instanceof ReflectionClass) {
+            if ($name === 'self') {
+                return $class->getName();
+            }
+
+            if ($name === 'parent' && ($parent = $class->getParentClass()) instanceof ReflectionClass) {
+                return $parent->getName();
+            }
+        }
+
+        return $name;
+    }
 }