Merge branch 'master' of https://github.com/pestphp/pest into feat-teamcity

 Conflicts:

	phpstan.neon

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/Concerns/TestCase.php

@@ -9,6 +9,7 @@ use Pest\Expectation;
 use Pest\Support\ExceptionTrace;
 use Pest\TestSuite;
 use PHPUnit\Util\Test;
+use Throwable;
 
 /**
  * To avoid inheritance conflicts, all the fields related
@@ -148,7 +149,7 @@ trait TestCase
      *
      * @return mixed
      *
-     * @throws \Throwable
+     * @throws Throwable
      */
     public function __test()
     {
@@ -158,7 +159,7 @@ trait TestCase
     /**
      * @return mixed
      *
-     * @throws \Throwable
+     * @throws Throwable
      */
     private function __callClosure(Closure $closure, array $arguments)
     {

src/Expectation.php

@@ -16,9 +16,11 @@ final class Expectation
     /**
      * The expectation value.
      *
+     * @readonly
+     *
      * @var mixed
      */
-    private $value;
+    public $value;
 
     /**
      * Creates a new expectation.
@@ -412,6 +414,36 @@ final class Expectation
         return $this;
     }
 
+    /**
+     * Asserts that the value is a file.
+     */
+    public function toBeFile(): Expectation
+    {
+        Assert::assertFileExists($this->value);
+
+        return $this;
+    }
+
+    /**
+     * Asserts that the value is a file and is readable.
+     */
+    public function toBeReadableFile(): Expectation
+    {
+        Assert::assertFileIsReadable($this->value);
+
+        return $this;
+    }
+
+    /**
+     * Asserts that the value is a file and is writable.
+     */
+    public function toBeWritableFile(): Expectation
+    {
+        Assert::assertFileIsWritable($this->value);
+
+        return $this;
+    }
+
     /**
      * Dynamically calls methods on the class without any arguments.
      *

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/Laravel/Commands/PestInstallCommand.php

@@ -6,6 +6,7 @@ namespace Pest\Laravel\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
+use Pest\Console\Thanks;
 use Pest\Exceptions\InvalidConsoleArgument;
 use Pest\Support\Str;
 
@@ -60,7 +61,9 @@ final class PestInstallCommand extends Command
         $this->output->success('`tests/Pest.php` created successfully.');
         $this->output->success('`tests/Helpers.php` created successfully.');
 
-        (new \Pest\Console\Thanks($this->output))();
+        if (!(bool) $this->option('no-interaction')) {
+            (new Thanks($this->output))();
+        }
     }
 
     /**

src/OppositeExpectation.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Pest;
 
 use PHPUnit\Framework\ExpectationFailedException;
+use SebastianBergmann\Exporter\Exporter;
 
 /**
  * @internal
@@ -40,7 +41,8 @@ final class OppositeExpectation
             return $this->original;
         }
 
-        throw new ExpectationFailedException(sprintf('@todo'));
+        // @phpstan-ignore-next-line
+        $this->throwExpectationFailedExpection($name, $arguments);
     }
 
     /**
@@ -55,6 +57,24 @@ final class OppositeExpectation
             return $this->original;
         }
 
-        throw new ExpectationFailedException(sprintf('@todo'));
+        // @phpstan-ignore-next-line
+        $this->throwExpectationFailedExpection($name);
+    }
+
+    /**
+     * Creates a new expectation failed exception
+     * with a nice readable message.
+     *
+     * @param array<int, mixed> $arguments
+     */
+    private function throwExpectationFailedExpection(string $name, array $arguments = []): void
+    {
+        $exporter = new Exporter();
+
+        $toString = function ($argument) use ($exporter): string {
+            return $exporter->shortenedExport($argument);
+        };
+
+        throw new ExpectationFailedException(sprintf('Expecting %s not %s %s.', $toString($this->original->value), strtolower((string) preg_replace('/(?<!\ )[A-Z]/', ' $0', $name)), implode(' ', array_map(function ($argument) use ($toString): string { return $toString($argument); }, $arguments))));
     }
 }

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/Repositories/TestRepository.php

@@ -11,6 +11,7 @@ use Pest\Exceptions\TestCaseClassOrTraitNotFound;
 use Pest\Factories\TestCaseFactory;
 use Pest\Support\Str;
 use Pest\TestSuite;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
@@ -52,7 +53,7 @@ final class TestRepository
                 if ((!is_dir($path) && $filename === $path) || (is_dir($path) && $startsWith($filename, $path))) {
                     foreach ($classOrTraits as $class) {
                         if (class_exists($class)) {
-                            if ($testCase->class !== \PHPUnit\Framework\TestCase::class) {
+                            if ($testCase->class !== TestCase::class) {
                                 throw new TestCaseAlreadyInUse($testCase->class, $class, $filename);
                             }
                             $testCase->class = $class;

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/ExceptionTrace.php

@@ -20,7 +20,7 @@ final class ExceptionTrace
      *
      * @return mixed
      *
-     * @throws \Throwable
+     * @throws Throwable
      */
     public static function ensure(Closure $closure)
     {

src/Support/HigherOrderMessage.php

@@ -76,8 +76,8 @@ final class HigherOrderMessage
             Reflection::setPropertyValue($throwable, 'file', $this->filename);
             Reflection::setPropertyValue($throwable, 'line', $this->line);
 
-            if ($throwable->getMessage() === sprintf(self::UNDEFINED_METHOD, $this->methodName)) {
-                /** @var \ReflectionClass $reflection */
+            if ($throwable->getMessage() === self::getUndefinedMethodMessage($target, $this->methodName)) {
+                /** @var ReflectionClass $reflection */
                 $reflection = new ReflectionClass($target);
                 /* @phpstan-ignore-next-line */
                 $reflection = $reflection->getParentClass() ?: $reflection;
@@ -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/HigherOrderTapProxy.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Pest\Support;
 
 use ReflectionClass;
+use Throwable;
 
 /**
  * @internal
@@ -51,12 +52,12 @@ final class HigherOrderTapProxy
         try {
             // @phpstan-ignore-next-line
             return $this->target->{$property};
-        } catch (\Throwable $throwable) {
+        } catch (Throwable $throwable) {
             Reflection::setPropertyValue($throwable, 'file', Backtrace::file());
             Reflection::setPropertyValue($throwable, 'line', Backtrace::line());
 
             if (Str::startsWith($message = $throwable->getMessage(), self::UNDEFINED_PROPERTY)) {
-                /** @var \ReflectionClass $reflection */
+                /** @var ReflectionClass $reflection */
                 $reflection = (new ReflectionClass($this->target))->getParentClass();
                 Reflection::setPropertyValue($throwable, 'message', sprintf('Undefined property %s::$%s', $reflection->getName(), $property));
             }

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;
+    }
 }

src/TestSuite.php

@@ -10,6 +10,7 @@ use Pest\Repositories\AfterEachRepository;
 use Pest\Repositories\BeforeAllRepository;
 use Pest\Repositories\BeforeEachRepository;
 use Pest\Repositories\TestRepository;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
@@ -19,7 +20,7 @@ final class TestSuite
     /**
      * Holds the current test case.
      *
-     * @var \PHPUnit\Framework\TestCase|null
+     * @var TestCase|null
      */
     public $test;
 

src/globals.php

@@ -44,8 +44,8 @@ function dataset(string $name, $dataset): void
 }
 
 /**
- * The uses function adds the binds the
- * given arguments to test closures.
+ * The uses function binds the given
+ * arguments to test closures.
  */
 function uses(string ...$classAndTraits): UsesCall
 {