release: v2.8.1

Add container registration for Kernel self

CHANGELOG.md

@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## [v2.8.1 (2023-06-20)](https://github.com/pestphp/pest/compare/v2.8.0...v2.8.1)
+
+### Fixed
+- Fixes "Cannot find TestCase object on call stack" ([eb7bb34](https://github.com/pestphp/pest/commit/eb7bb348253f412e806a6ba6f0df46c0435d0dfe))
+
+## [v2.8.0 (2023-06-19)](https://github.com/pestphp/pest/compare/v2.7.0...v2.8.0)
+
+### Added
+- Support for `globs` in `uses` ([#829](https://github.com/pestphp/pest/pull/829))
+
+## [v2.7.0 (2023-06-15)](https://github.com/pestphp/pest/compare/v2.6.3...v2.7.0)
+
+### Added
+- Support for unexpected output on printer ([eb9f31e](https://github.com/pestphp/pest/commit/eb9f31edeb00a88c449874f3d48156128a00fff8))
+
+### Chore
+- Bumps PHPUnit to `^10.2.2` ([0e5470b](https://github.com/pestphp/pest/commit/0e5470b192b259ba2db7c02a50371216c98fc0a6))
+
+## [v2.6.3 (2023-06-07)](https://github.com/pestphp/pest/compare/v2.6.2...v2.6.3)
+
+### Chore
+- Bumps PHPUnit to `^10.2.1` ([73a859e](https://github.com/pestphp/pest/commit/73a859ee563fe96944ba39b191dceca28ef703c2))
+
+## [v2.6.2 (2023-06-02)](https://github.com/pestphp/pest/compare/v2.6.1...v2.6.2)
+
+### Chore
+- Bumps PHPUnit to `^10.2.0` ([a0041f1](https://github.com/pestphp/pest/commit/a0041f139cba94fe5d15318c38e275f2e2fb3350))
+
+## [v2.6.1 (2023-04-12)](https://github.com/pestphp/pest/compare/v2.6.0...v2.6.1)
+
+### Fixes
+- PHPStorm issue output problem for tests throwing an exception before the first assertion ([#809](https://github.com/pestphp/pest/pull/809))
+- Allow traits to be covered ([#804](https://github.com/pestphp/pest/pull/804))
+
+### Chore
+- Bumps PHPUnit to `^10.1.3` ([c993252](https://github.com/pestphp/pest/commit/c99325275acf1fd3759b487b93ec50473f706709))
+
+## [v2.6.0 (2023-04-05)](https://github.com/pestphp/pest/compare/v2.5.2...v2.6.0)
+
+### Adds
+- Allows `toThrow` to be used against an exception instance ([#797](https://github.com/pestphp/pest/pull/797))
+
+## [v2.5.2 (2023-04-19)](https://github.com/pestphp/pest/compare/v2.5.1...v2.5.2)
+
+### Chore
+- Removes `myclabs/php-enuma` dependency ([1a05df1](https://github.com/pestphp/pest/commit/1a05df14d0ce7d12583df26ff716807db6f81f13))
+
+## [v2.5.1 (2023-04-18)](https://github.com/pestphp/pest/compare/v2.5.0...v2.5.1)
+
+### Chore
+- Bumps PHPUnit to `^10.1.1` ([ec6a817](https://github.com/pestphp/pest/commit/ec6a81735af19f5463d24545df97535d77697ec6))
+
 ## [v2.5.0 (2023-04-14)](https://github.com/pestphp/pest/compare/v2.4.0...v2.5.0)
 
 ### Chore

bin/worker.php

@@ -31,6 +31,7 @@ $bootPest = (static function (): void {
     $getopt = getopt('', [
         'status-file:',
         'progress-file:',
+        'unexpected-output-file:',
         'testresult-file:',
         'teamcity-file:',
         'testdox-file:',
@@ -58,6 +59,7 @@ $bootPest = (static function (): void {
     assert(is_resource($statusFile));
 
     assert(isset($getopt['progress-file']) && is_string($getopt['progress-file']));
+    assert(isset($getopt['unexpected-output-file']) && is_string($getopt['unexpected-output-file']));
     assert(isset($getopt['testresult-file']) && is_string($getopt['testresult-file']));
     assert(! isset($getopt['teamcity-file']) || is_string($getopt['teamcity-file']));
     assert(! isset($getopt['testdox-file']) || is_string($getopt['testdox-file']));
@@ -73,6 +75,7 @@ $bootPest = (static function (): void {
     $application = new ApplicationForWrapperWorker(
         $phpunitArgv,
         $getopt['progress-file'],
+        $getopt['unexpected-output-file'],
         $getopt['testresult-file'],
         $getopt['teamcity-file'] ?? null,
         $getopt['testdox-file'] ?? null,
@@ -88,10 +91,10 @@ $bootPest = (static function (): void {
         $testPath = fgets(STDIN);
         if ($testPath === false || $testPath === WrapperWorker::COMMAND_EXIT) {
             $application->end();
-
             exit;
         }
 
+        // It must be a 1 byte string to ensure filesize() is equal to the number of tests executed
         $exitCode = $application->runTest(realpath(trim($testPath)));
 
         fwrite($statusFile, (string) $exitCode);

composer.json

@@ -18,16 +18,16 @@
     ],
     "require": {
         "php": "^8.1.0",
-        "brianium/paratest": "^7.1.3",
-        "nunomaduro/collision": "^7.4.0",
+        "brianium/paratest": "^7.2.0",
+        "nunomaduro/collision": "^7.6.0",
         "nunomaduro/termwind": "^1.15.1",
         "pestphp/pest-plugin": "^2.0.1",
-        "pestphp/pest-plugin-arch": "^2.1.1",
-        "phpunit/phpunit": "^10.1.0"
+        "pestphp/pest-plugin-arch": "^2.2.1",
+        "phpunit/phpunit": "^10.2.2"
     },
     "conflict": {
         "webmozart/assert": "<1.11.0",
-        "phpunit/phpunit": ">10.1.0"
+        "phpunit/phpunit": ">10.2.2"
     },
     "autoload": {
         "psr-4": {
@@ -49,8 +49,8 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^2.6.0",
-        "symfony/process": "^6.2.8"
+        "pestphp/pest-dev-tools": "^2.12.0",
+        "symfony/process": "^6.3.0"
     },
     "minimum-stability": "stable",
     "config": {

phpstan.neon

@@ -12,6 +12,7 @@ parameters:
     reportUnmatchedIgnoredErrors: true
 
     ignoreErrors:
+        - "#has a nullable return type declaration.#"
         - "#Language construct isset\\(\\) should not be used.#"
         - "#is not allowed to extend#"
         - "#is concrete, but does not have a Test suffix#"
@@ -20,4 +21,3 @@ parameters:
         - "# with null as default value#"
         - "#has parameter \\$closure with default value.#"
         - "#has parameter \\$description with default value.#"
-        - "#Method Pest\\\\Support\\\\Reflection::getParameterClassName\\(\\) has a nullable return type declaration.#"

src/Bootstrappers/BootExcludeList.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use PHPUnit\Util\ExcludeList;
+
+/**
+ * @internal
+ */
+final class BootExcludeList implements Bootstrapper
+{
+    /**
+     * The directories to exclude.
+     *
+     * @var array<int, non-empty-string>
+     */
+    private const EXCLUDE_LIST = [
+        'bin',
+        'overrides',
+        'resources',
+        'src',
+        'stubs',
+    ];
+
+    /**
+     * Boots the "exclude list" for PHPUnit to ignore Pest files.
+     */
+    public function boot(): void
+    {
+        $baseDirectory = dirname(__DIR__, 2);
+
+        foreach (self::EXCLUDE_LIST as $directory) {
+            ExcludeList::addDirectory($baseDirectory.DIRECTORY_SEPARATOR.$directory);
+        }
+    }
+}

src/Concerns/Testable.php

@@ -181,7 +181,7 @@ trait Testable
 
         parent::setUp();
 
-        $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename);
+        $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename)[1];
 
         if ($this->__beforeEach instanceof Closure) {
             $beforeEach = ChainableClosure::from($this->__beforeEach, $beforeEach);

src/Expectation.php

@@ -167,7 +167,7 @@ final class Expectation
      *
      * @template TSequenceValue
      *
-     * @param (callable(self<TValue>, self<string|int>): void)|TSequenceValue ...$callbacks
+     * @param  (callable(self<TValue>, self<string|int>): void)|TSequenceValue  ...$callbacks
      * @return self<TValue>
      */
     public function sequence(mixed ...$callbacks): self
@@ -210,8 +210,8 @@ final class Expectation
      *
      * @template TMatchSubject of array-key
      *
-     * @param (callable(): TMatchSubject)|TMatchSubject $subject
-     * @param array<TMatchSubject, (callable(self<TValue>): mixed)|TValue> $expressions
+     * @param  (callable(): TMatchSubject)|TMatchSubject  $subject
+     * @param  array<TMatchSubject, (callable(self<TValue>): mixed)|TValue>  $expressions
      * @return self<TValue>
      */
     public function match(mixed $subject, array $expressions): self
@@ -248,7 +248,7 @@ final class Expectation
     /**
      * Apply the callback if the given "condition" is falsy.
      *
-     * @param (callable(): bool)|bool $condition
+     * @param  (callable(): bool)|bool  $condition
      * @param  callable(Expectation<TValue>): mixed  $callback
      * @return self<TValue>
      */
@@ -264,7 +264,7 @@ final class Expectation
     /**
      * Apply the callback if the given "condition" is truthy.
      *
-     * @param (callable(): bool)|bool $condition
+     * @param  (callable(): bool)|bool  $condition
      * @param  callable(self<TValue>): mixed  $callback
      * @return self<TValue>
      */

src/Factories/Annotations/TestDox.php

@@ -14,7 +14,17 @@ final class TestDox implements AddsAnnotations
      */
     public function __invoke(TestCaseMethodFactory $method, array $annotations): array
     {
-        $annotations[] = "@testdox $method->description";
+        /*
+       * escapes docblock according to
+       * https://manual.phpdoc.org/HTMLframesConverter/default/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.desc
+       *
+       * note: '@' escaping is not needed as it cannot be the first character of the line (it always starts with @testdox
+       */
+
+        assert($method->description !== null);
+        $methodDescription = str_replace('*/', '{@*}', $method->description);
+
+        $annotations[] = "@testdox $methodDescription";
 
         return $annotations;
     }

src/Factories/TestCaseMethodFactory.php

@@ -90,7 +90,7 @@ final class TestCaseMethodFactory
         $method = $this;
 
         return function () use ($testCase, $method, $closure): mixed { // @phpstan-ignore-line
-        /* @var TestCase $this */
+            /* @var TestCase $this */
             $testCase->proxies->proxy($this);
             $method->proxies->proxy($this);
 

src/Functions.php

@@ -43,7 +43,7 @@ if (! function_exists('beforeEach')) {
     /**
      * Runs the given closure before each test in the current file.
      *
-     * @return HigherOrderTapProxy<TestCall|TestCase>|TestCall|mixed
+     * @return HigherOrderTapProxy<TestCall|TestCase>|TestCall|TestCase|mixed
      */
     function beforeEach(Closure $closure = null): BeforeEachCall
     {

src/Kernel.php

@@ -33,6 +33,7 @@ final class Kernel
         Bootstrappers\BootFiles::class,
         Bootstrappers\BootView::class,
         Bootstrappers\BootKernelDump::class,
+        Bootstrappers\BootExcludeList::class,
     ];
 
     /**
@@ -67,10 +68,14 @@ final class Kernel
 
         CallsBoot::execute();
 
-        return new self(
+        $kernel = new self(
             new Application(),
             $output,
         );
+
+        Container::getInstance()->add(self::class, $kernel);
+
+        return $kernel;
     }
 
     /**

src/Logging/TeamCity/Converter.php

@@ -11,6 +11,12 @@ use Pest\Support\Str;
 use PHPUnit\Event\Code\Test;
 use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Event\Code\Throwable;
+use PHPUnit\Event\Test\BeforeFirstTestMethodErrored;
+use PHPUnit\Event\Test\ConsideredRisky;
+use PHPUnit\Event\Test\Errored;
+use PHPUnit\Event\Test\Failed;
+use PHPUnit\Event\Test\MarkedIncomplete;
+use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\TestSuite\TestSuite;
 use PHPUnit\Framework\Exception as FrameworkException;
 use PHPUnit\TestRunner\TestResult\TestResult as PhpUnitTestResult;
@@ -188,12 +194,30 @@ final class Converter
      */
     public function getStateFromResult(PhpUnitTestResult $result): State
     {
-        $numberOfPassedTests = $result->numberOfTestsRun()
-            - $result->numberOfTestErroredEvents()
-            - $result->numberOfTestFailedEvents()
-            - $result->numberOfTestSkippedEvents()
-            - $result->numberOfTestsWithTestConsideredRiskyEvents()
-            - $result->numberOfTestMarkedIncompleteEvents();
+        $events = [
+            ...$result->testErroredEvents(),
+            ...$result->testFailedEvents(),
+            ...$result->testSkippedEvents(),
+            ...array_merge(...array_values($result->testConsideredRiskyEvents())),
+            ...$result->testMarkedIncompleteEvents(),
+        ];
+
+        $numberOfNotPassedTests = count(
+            array_unique(
+                array_map(
+                    function (BeforeFirstTestMethodErrored|Errored|Failed|Skipped|ConsideredRisky|MarkedIncomplete $event): string {
+                        if ($event instanceof BeforeFirstTestMethodErrored) {
+                            return $event->testClassName();
+                        }
+
+                        return $this->getTestCaseLocation($event->test());
+                    },
+                    $events
+                )
+            )
+        );
+
+        $numberOfPassedTests = $result->numberOfTestsRun() - $numberOfNotPassedTests;
 
         return $this->stateGenerator->fromPhpUnitTestResult($numberOfPassedTests, $result);
     }

src/Logging/TeamCity/ServiceMessage.php

@@ -25,7 +25,7 @@ final class ServiceMessage
         $paramsToString = '';
 
         foreach ([...$this->parameters, 'flowId' => self::$flowId] as $key => $value) {
-            $value = self::escapeServiceMessage((string) $value);
+            $value = $this->escapeServiceMessage((string) $value);
             $paramsToString .= " $key='$value'";
         }
 
@@ -127,7 +127,7 @@ final class ServiceMessage
         ]);
     }
 
-    private static function escapeServiceMessage(string $text): string
+    private function escapeServiceMessage(string $text): string
     {
         return str_replace(
             ['|', "'", "\n", "\r", ']', '['],

src/Logging/TeamCity/TeamCityLogger.php

@@ -16,6 +16,7 @@ use Pest\Logging\TeamCity\Subscriber\TestPreparedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestSkippedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestSuiteFinishedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestSuiteStartedSubscriber;
+use PHPUnit\Event\Code\Test;
 use PHPUnit\Event\EventFacadeIsSealedException;
 use PHPUnit\Event\Facade;
 use PHPUnit\Event\Telemetry\Duration;
@@ -47,6 +48,11 @@ final class TeamCityLogger
 
     private bool $isSummaryTestCountPrinted = false;
 
+    /**
+     * @var array<string, bool>
+     */
+    private array $testEvents = [];
+
     /**
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
@@ -108,12 +114,14 @@ final class TeamCityLogger
 
     public function testSkipped(Skipped $event): void
     {
-        $message = ServiceMessage::testIgnored(
-            $this->converter->getTestCaseMethodName($event->test()),
-            'This test was ignored.'
-        );
+        $this->whenFirstEventForTest($event->test(), function () use ($event): void {
+            $message = ServiceMessage::testIgnored(
+                $this->converter->getTestCaseMethodName($event->test()),
+                'This test was ignored.'
+            );
 
-        $this->output($message);
+            $this->output($message);
+        });
     }
 
     /**
@@ -122,17 +130,19 @@ final class TeamCityLogger
      */
     public function testErrored(Errored $event): void
     {
-        $testName = $this->converter->getTestCaseMethodName($event->test());
-        $message = $this->converter->getExceptionMessage($event->throwable());
-        $details = $this->converter->getExceptionDetails($event->throwable());
+        $this->whenFirstEventForTest($event->test(), function () use ($event): void {
+            $testName = $this->converter->getTestCaseMethodName($event->test());
+            $message = $this->converter->getExceptionMessage($event->throwable());
+            $details = $this->converter->getExceptionDetails($event->throwable());
 
-        $message = ServiceMessage::testFailed(
-            $testName,
-            $message,
-            $details,
-        );
+            $message = ServiceMessage::testFailed(
+                $testName,
+                $message,
+                $details,
+            );
 
-        $this->output($message);
+            $this->output($message);
+        });
     }
 
     /**
@@ -141,28 +151,30 @@ final class TeamCityLogger
      */
     public function testFailed(Failed $event): void
     {
-        $testName = $this->converter->getTestCaseMethodName($event->test());
-        $message = $this->converter->getExceptionMessage($event->throwable());
-        $details = $this->converter->getExceptionDetails($event->throwable());
+        $this->whenFirstEventForTest($event->test(), function () use ($event): void {
+            $testName = $this->converter->getTestCaseMethodName($event->test());
+            $message = $this->converter->getExceptionMessage($event->throwable());
+            $details = $this->converter->getExceptionDetails($event->throwable());
 
-        if ($event->hasComparisonFailure()) {
-            $comparison = $event->comparisonFailure();
-            $message = ServiceMessage::comparisonFailure(
-                $testName,
-                $message,
-                $details,
-                $comparison->actual(),
-                $comparison->expected()
-            );
-        } else {
-            $message = ServiceMessage::testFailed(
-                $testName,
-                $message,
-                $details,
-            );
-        }
+            if ($event->hasComparisonFailure()) {
+                $comparison = $event->comparisonFailure();
+                $message = ServiceMessage::comparisonFailure(
+                    $testName,
+                    $message,
+                    $details,
+                    $comparison->actual(),
+                    $comparison->expected()
+                );
+            } else {
+                $message = ServiceMessage::testFailed(
+                    $testName,
+                    $message,
+                    $details,
+                );
+            }
 
-        $this->output($message);
+            $this->output($message);
+        });
     }
 
     /**
@@ -171,12 +183,14 @@ final class TeamCityLogger
      */
     public function testConsideredRisky(ConsideredRisky $event): void
     {
-        $message = ServiceMessage::testIgnored(
-            $this->converter->getTestCaseMethodName($event->test()),
-            $event->message()
-        );
+        $this->whenFirstEventForTest($event->test(), function () use ($event): void {
+            $message = ServiceMessage::testIgnored(
+                $this->converter->getTestCaseMethodName($event->test()),
+                $event->message()
+            );
 
-        $this->output($message);
+            $this->output($message);
+        });
     }
 
     public function testFinished(Finished $event): void
@@ -264,4 +278,14 @@ final class TeamCityLogger
 
         ServiceMessage::setFlowId($this->flowId);
     }
+
+    private function whenFirstEventForTest(Test $test, callable $callback): void
+    {
+        $testIdentifier = $this->converter->getTestCaseLocation($test);
+
+        if (! isset($this->testEvents[$testIdentifier])) {
+            $this->testEvents[$testIdentifier] = true;
+            $callback();
+        }
+    }
 }

src/Mixins/Expectation.php

@@ -839,10 +839,10 @@ final class Expectation
     /**
      * Asserts that executing value throws an exception.
      *
-     * @param (Closure(Throwable): mixed)|string $exception
+     * @param  (Closure(Throwable): mixed)|string  $exception
      * @return self<TValue>
      */
-    public function toThrow(callable|string $exception, string $exceptionMessage = null, string $message = ''): self
+    public function toThrow(callable|string|Throwable $exception, string $exceptionMessage = null, string $message = ''): self
     {
         $callback = NullClosure::create();
 
@@ -864,6 +864,15 @@ final class Expectation
         try {
             ($this->value)();
         } catch (Throwable $e) {
+
+            if ($exception instanceof Throwable) {
+                expect($e)
+                    ->toBeInstanceOf($exception::class, $message)
+                    ->and($e->getMessage())->toBe($exceptionMessage ?? $exception->getMessage(), $message);
+
+                return $this;
+            }
+
             if (! class_exists($exception)) {
                 if ($e instanceof Error && $e->getMessage() === "Class \"$exception\" not found") {
                     Assert::assertTrue(true);
@@ -888,7 +897,7 @@ final class Expectation
 
         Assert::assertTrue(true);
 
-        if (! class_exists($exception)) {
+        if (! $exception instanceof Throwable && ! class_exists($exception)) {
             throw new ExpectationFailedException("Exception with message \"$exception\" not thrown.");
         }
 

src/PendingCalls/BeforeEachCall.php

@@ -19,12 +19,17 @@ final class BeforeEachCall
     /**
      * Holds the before each closure.
      */
-    private readonly \Closure $closure;
+    private readonly Closure $closure;
 
     /**
-     * The calls that should be proxied.
+     * The test call proxies.
      */
-    private readonly HigherOrderMessageCollection $proxies;
+    private readonly HigherOrderMessageCollection $testCallProxies;
+
+    /**
+     * The test case proxies.
+     */
+    private readonly HigherOrderMessageCollection $testCaseProxies;
 
     /**
      * Creates a new Pending Call.
@@ -36,7 +41,8 @@ final class BeforeEachCall
     ) {
         $this->closure = $closure instanceof Closure ? $closure : NullClosure::create();
 
-        $this->proxies = new HigherOrderMessageCollection();
+        $this->testCallProxies = new HigherOrderMessageCollection();
+        $this->testCaseProxies = new HigherOrderMessageCollection();
     }
 
     /**
@@ -44,13 +50,16 @@ final class BeforeEachCall
      */
     public function __destruct()
     {
-        $proxies = $this->proxies;
+        $testCaseProxies = $this->testCaseProxies;
 
         $this->testSuite->beforeEach->set(
             $this->filename,
-            ChainableClosure::from(function () use ($proxies): void {
-                $proxies->chain($this);
-            }, $this->closure)
+            function (TestCall $testCall): void {
+                $this->testCallProxies->chain($testCall);
+            },
+            ChainableClosure::from(function () use ($testCaseProxies): void {
+                $testCaseProxies->chain($this);
+            }, $this->closure),
         );
     }
 
@@ -61,7 +70,13 @@ final class BeforeEachCall
      */
     public function __call(string $name, array $arguments): self
     {
-        $this->proxies
+        if (method_exists(TestCall::class, $name)) {
+            $this->testCallProxies->add(Backtrace::file(), Backtrace::line(), $name, $arguments);
+
+            return $this;
+        }
+
+        $this->testCaseProxies
             ->add(Backtrace::file(), Backtrace::line(), $name, $arguments);
 
         return $this;

src/PendingCalls/TestCall.php

@@ -40,12 +40,15 @@ final class TestCall
      */
     public function __construct(
         private readonly TestSuite $testSuite,
-        string $filename,
+        private readonly string $filename,
         string $description = null,
         Closure $closure = null
     ) {
         $this->testCaseMethod = new TestCaseMethodFactory($filename, $description, $closure);
+
         $this->descriptionLess = $description === null;
+
+        $this->testSuite->beforeEach->get($filename)[0]($this);
     }
 
     /**
@@ -81,7 +84,7 @@ final class TestCall
     /**
      * Asserts that the test throws the given `$exceptionClass` when called if the given condition is true.
      *
-     * @param (callable(): bool)|bool $condition
+     * @param  (callable(): bool)|bool  $condition
      */
     public function throwsIf(callable|bool $condition, string|int $exception, string $exceptionMessage = null, int $exceptionCode = null): self
     {
@@ -167,7 +170,7 @@ final class TestCall
 
         $this->testCaseMethod
             ->chains
-            ->addWhen($condition, Backtrace::file(), Backtrace::line(), 'markTestSkipped', [$message]);
+            ->addWhen($condition, $this->filename, Backtrace::line(), 'markTestSkipped', [$message]);
 
         return $this;
     }
@@ -224,7 +227,7 @@ final class TestCall
     public function covers(string ...$classesOrFunctions): self
     {
         foreach ($classesOrFunctions as $classOrFunction) {
-            $isClass = class_exists($classOrFunction);
+            $isClass = class_exists($classOrFunction) || trait_exists($classOrFunction);
             $isMethod = function_exists($classOrFunction);
 
             if (! $isClass && ! $isMethod) {

src/PendingCalls/UsesCall.php

@@ -84,8 +84,10 @@ final class UsesCall
         }, $targets);
 
         $this->targets = array_reduce($targets, function (array $accumulator, string $target): array {
-            if (is_dir($target) || file_exists($target)) {
-                $accumulator[] = (string) realpath($target);
+            if (($matches = glob($target)) !== false) {
+                foreach ($matches as $file) {
+                    $accumulator[] = (string) realpath($file);
+                }
             }
 
             return $accumulator;

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '2.4.0';
+    return '2.8.1';
 }
 
 function testDirectory(string $file = ''): string

src/Plugins/Help.php

@@ -109,20 +109,16 @@ final class Help implements HandlesArguments
             ],
         ], ...$content['Execution']];
 
-        $content['Selection'] = array_merge([
-            [
-                'arg' => '--bail',
-                'desc' => 'Stop execution upon first not-passed test',
-            ],
-            [
-                'arg' => '--todos',
-                'desc' => 'Output to standard output the list of todos',
-            ],
-            [
-                'arg' => '--retry',
-                'desc' => 'Run non-passing tests first and stop execution upon first error or failure',
-            ],
-        ], $content['Selection']);
+        $content['Selection'] = [[
+            'arg' => '--bail',
+            'desc' => 'Stop execution upon first not-passed test',
+        ], [
+            'arg' => '--todos',
+            'desc' => 'Output to standard output the list of todos',
+        ], [
+            'arg' => '--retry',
+            'desc' => 'Run non-passing tests first and stop execution upon first error or failure',
+        ], ...$content['Selection']];
 
         $content['Reporting'] = [...$content['Reporting'], ...[
             [
@@ -131,16 +127,13 @@ final class Help implements HandlesArguments
             ],
         ]];
 
-        $content['Code Coverage'] = array_merge([
-            [
-                'arg' => '--coverage ',
-                'desc' => 'Generate code coverage report and output to standard output',
-            ],
-            [
-                'arg' => '--coverage --min',
-                'desc' => 'Set the minimum required coverage percentage, and fail if not met',
-            ],
-        ], $content['Code Coverage']);
+        $content['Code Coverage'] = [[
+            'arg' => '--coverage ',
+            'desc' => 'Generate code coverage report and output to standard output',
+        ], [
+            'arg' => '--coverage --min',
+            'desc' => 'Set the minimum required coverage percentage, and fail if not met',
+        ], ...$content['Code Coverage']];
 
         $content['Profiling'] = [
             [

src/Plugins/Init.php

@@ -26,11 +26,11 @@ final class Init implements HandlesArguments
      * The files that will be created.
      */
     private const STUBS = [
-        'phpunit.xml' => 'phpunit.xml',
-        'Pest.php' => 'tests/Pest.php',
-        'TestCase.php' => 'tests/TestCase.php',
-        'Unit/ExampleTest.php' => 'tests/Unit/ExampleTest.php',
-        'Feature/ExampleTest.php' => 'tests/Feature/ExampleTest.php',
+        'phpunit.xml.stub' => 'phpunit.xml',
+        'Pest.php.stub' => 'tests/Pest.php',
+        'TestCase.php.stub' => 'tests/TestCase.php',
+        'Unit/ExampleTest.php.stub' => 'tests/Unit/ExampleTest.php',
+        'Feature/ExampleTest.php.stub' => 'tests/Feature/ExampleTest.php',
     ];
 
     /**
@@ -60,13 +60,13 @@ final class Init implements HandlesArguments
 
         $this->init();
 
-        return array_values($arguments);
+        exit(0);
     }
 
     /**
      * Initializes the tests directory.
      */
-    private function init(): void
+    public function init(): void
     {
         $testsBaseDir = "{$this->testSuite->rootPath}/tests";
 
@@ -112,8 +112,6 @@ final class Init implements HandlesArguments
         View::render('components.new-line');
 
         (new Thanks($this->input, $this->output))();
-
-        exit(0);
     }
 
     /**

src/Plugins/Parallel/Paratest/ResultPrinter.php

@@ -12,20 +12,20 @@ use function fread;
 use function fseek;
 use function ftell;
 use function fwrite;
-use NunoMaduro\Collision\Adapters\Phpunit\State;
 use ParaTest\Options;
 use Pest\Plugins\Parallel\Support\CompactPrinter;
 use Pest\Support\StateGenerator;
 use PHPUnit\TestRunner\TestResult\TestResult;
 use PHPUnit\TextUI\Output\Printer;
-use function preg_replace;
 use SebastianBergmann\Timer\Duration;
 use SplFileInfo;
 use function strlen;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Output\OutputInterface;
 
-/** @internal */
+/**
+ * @internal
+ */
 final class ResultPrinter
 {
     /**
@@ -51,7 +51,7 @@ final class ResultPrinter
     /** @var resource|null */
     private $teamcityLogFileHandle;
 
-    /** @var array<string, int> */
+    /** @var array<non-empty-string, int> */
     private array $tailPositions;
 
     public function __construct(
@@ -74,6 +74,7 @@ final class ResultPrinter
                 if (str_starts_with($buffer, 'done [')) {
                     return;
                 }
+
                 $this->output->write(OutputFormatter::escape($buffer));
             }
 
@@ -93,9 +94,12 @@ final class ResultPrinter
         $this->teamcityLogFileHandle = $teamcityLogFileHandle;
     }
 
-    /** @param  array<int, SplFileInfo>  $teamcityFiles */
-    public function printFeedback(SplFileInfo $progressFile, array $teamcityFiles): void
-    {
+    /** @param  list<SplFileInfo>  $teamcityFiles */
+    public function printFeedback(
+        SplFileInfo $progressFile,
+        SplFileInfo $outputFile,
+        array $teamcityFiles
+    ): void {
         if ($this->options->needsTeamcity) {
             $teamcityProgress = $this->tailMultiple($teamcityFiles);
 
@@ -115,6 +119,15 @@ final class ResultPrinter
             return;
         }
 
+        $unexpectedOutput = $this->tail($outputFile);
+        if ($unexpectedOutput !== '') {
+            if (preg_match('/^T+$/', $unexpectedOutput) > 0) {
+                return;
+            }
+
+            $this->output->write($unexpectedOutput);
+        }
+
         $feedbackItems = $this->tail($progressFile);
         if ($feedbackItems === '') {
             return;
@@ -129,8 +142,8 @@ final class ResultPrinter
     }
 
     /**
-     * @param  array<int, SplFileInfo>  $teamcityFiles
-     * @param  array<int, SplFileInfo>  $testdoxFiles
+     * @param  list<SplFileInfo>  $teamcityFiles
+     * @param  list<SplFileInfo>  $testdoxFiles
      */
     public function printResults(TestResult $testResult, array $teamcityFiles, array $testdoxFiles, Duration $duration): void
     {
@@ -183,7 +196,7 @@ final class ResultPrinter
         $this->compactPrinter->descriptionItem($item);
     }
 
-    /** @param  array<int, SplFileInfo>  $files */
+    /** @param  list<SplFileInfo>  $files */
     private function tailMultiple(array $files): string
     {
         $content = '';
@@ -201,6 +214,7 @@ final class ResultPrinter
     private function tail(SplFileInfo $file): string
     {
         $path = $file->getPathname();
+        assert($path !== '');
         $handle = fopen($path, 'r');
         assert($handle !== false);
         $fseek = fseek($handle, $this->tailPositions[$path] ?? 0);

src/Plugins/Parallel/Paratest/WrapperRunner.php

@@ -48,36 +48,39 @@ final class WrapperRunner implements RunnerInterface
 
     private readonly Timer $timer;
 
-    /** @var array<int, string> */
+    /** @var list<non-empty-string> */
     private array $pending = [];
 
-    private int $exitCode = -1;
+    private int $exitcode = -1;
 
-    /** @var array<int,WrapperWorker> */
+    /** @var array<positive-int,WrapperWorker> */
     private array $workers = [];
 
     /** @var array<int,int> */
     private array $batches = [];
 
-    /** @var array<int, SplFileInfo> */
+    /** @var list<SplFileInfo> */
+    private array $unexpectedOutputFiles = [];
+
+    /** @var list<SplFileInfo> */
     private array $testresultFiles = [];
 
-    /** @var array<int, SplFileInfo> */
+    /** @var list<SplFileInfo> */
     private array $coverageFiles = [];
 
-    /** @var array<int, SplFileInfo> */
+    /** @var list<SplFileInfo> */
     private array $junitFiles = [];
 
-    /** @var array<int, SplFileInfo> */
+    /** @var list<SplFileInfo> */
     private array $teamcityFiles = [];
 
-    /** @var array<int, SplFileInfo> */
+    /** @var list<SplFileInfo> */
     private array $testdoxFiles = [];
 
-    /** @var array<int, string> */
+    /** @var non-empty-string[] */
     private readonly array $parameters;
 
-    private readonly CodeCoverageFilterRegistry $codeCoverageFilterRegistry;
+    private CodeCoverageFilterRegistry $codeCoverageFilterRegistry;
 
     public function __construct(
         private readonly Options $options,
@@ -86,11 +89,10 @@ final class WrapperRunner implements RunnerInterface
         $this->printer = new ResultPrinter($output, $options);
         $this->timer = new Timer();
 
-        $worker = realpath(
+        $wrapper = realpath(
             dirname(__DIR__, 4).DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR.'worker.php',
         );
-
-        assert($worker !== false);
+        assert($wrapper !== false);
         $phpFinder = new PhpExecutableFinder();
         $phpBin = $phpFinder->find(false);
         assert($phpBin !== false);
@@ -101,7 +103,7 @@ final class WrapperRunner implements RunnerInterface
             $parameters = array_merge($parameters, $options->passthruPhp);
         }
 
-        $parameters[] = $worker;
+        $parameters[] = $wrapper;
 
         $this->parameters = $parameters;
         $this->codeCoverageFilterRegistry = new CodeCoverageFilterRegistry();
@@ -110,14 +112,15 @@ final class WrapperRunner implements RunnerInterface
     public function run(): int
     {
         $directory = dirname(__DIR__);
-        assert(strlen($directory) > 0);
+        assert($directory !== '');
         ExcludeList::addDirectory($directory);
-
         TestResultFacade::init();
-
         EventFacade::instance()->seal();
-
-        $suiteLoader = new SuiteLoader($this->options, $this->output, $this->codeCoverageFilterRegistry);
+        $suiteLoader = new SuiteLoader(
+            $this->options,
+            $this->output,
+            $this->codeCoverageFilterRegistry,
+        );
         $this->pending = $this->getTestFiles($suiteLoader);
 
         $result = TestResultFacade::result();
@@ -142,7 +145,7 @@ final class WrapperRunner implements RunnerInterface
     {
         $batchSize = $this->options->maxBatchSize;
 
-        while ($this->pending !== [] && $this->workers !== []) {
+        while (count($this->pending) > 0 && count($this->workers) > 0) {
             foreach ($this->workers as $token => $worker) {
                 if (! $worker->isRunning()) {
                     throw $worker->getWorkerCrashedException();
@@ -160,13 +163,11 @@ final class WrapperRunner implements RunnerInterface
                 }
 
                 if (
-                    $this->exitCode > 0
+                    $this->exitcode > 0
                     && $this->options->configuration->stopOnFailure()
                 ) {
                     $this->pending = [];
                 } elseif (($pending = array_shift($this->pending)) !== null) {
-                    $this->debug(sprintf('Assigning %s to worker %d', $pending, $token));
-
                     $worker->assign($pending);
                     $this->batches[$token]++;
                 }
@@ -178,9 +179,10 @@ final class WrapperRunner implements RunnerInterface
 
     private function flushWorker(WrapperWorker $worker): void
     {
-        $this->exitCode = max($this->exitCode, $worker->getExitCode());
+        $this->exitcode = max($this->exitcode, $worker->getExitCode());
         $this->printer->printFeedback(
             $worker->progressFile,
+            $worker->unexpectedOutputFile,
             $this->teamcityFiles,
         );
         $worker->reset();
@@ -189,10 +191,10 @@ final class WrapperRunner implements RunnerInterface
     private function waitForAllToFinish(): void
     {
         $stopped = [];
-        while ($this->workers !== []) {
+        while (count($this->workers) > 0) {
             foreach ($this->workers as $index => $worker) {
                 if ($worker->isRunning()) {
-                    if (! array_key_exists($index, $stopped) && $worker->isFree()) {
+                    if (! isset($stopped[$index]) && $worker->isFree()) {
                         $worker->stop();
                         $stopped[$index] = true;
                     }
@@ -212,22 +214,19 @@ final class WrapperRunner implements RunnerInterface
         }
     }
 
+    /** @param  positive-int  $token */
     private function startWorker(int $token): WrapperWorker
     {
-        /** @var array<non-empty-string> $parameters */
-        $parameters = $this->parameters;
-
         $worker = new WrapperWorker(
             $this->output,
             $this->options,
-            $parameters,
+            $this->parameters,
             $token,
         );
-
         $worker->start();
-
         $this->batches[$token] = 0;
 
+        $this->unexpectedOutputFiles[] = $worker->unexpectedOutputFile;
         $this->testresultFiles[] = $worker->testresultFile;
 
         if (isset($worker->junitFile)) {
@@ -330,15 +329,16 @@ final class WrapperRunner implements RunnerInterface
         $this->generateCodeCoverageReports();
         $this->generateLogs();
 
-        $exitCode = Result::exitCode($this->options->configuration, $testResultSum);
+        $exitcode = Result::exitCode($this->options->configuration, $testResultSum);
 
+        $this->clearFiles($this->unexpectedOutputFiles);
         $this->clearFiles($this->testresultFiles);
         $this->clearFiles($this->coverageFiles);
         $this->clearFiles($this->junitFiles);
         $this->clearFiles($this->teamcityFiles);
         $this->clearFiles($this->testdoxFiles);
 
-        return $exitCode;
+        return $exitcode;
     }
 
     private function generateCodeCoverageReports(): void
@@ -348,10 +348,11 @@ final class WrapperRunner implements RunnerInterface
         }
 
         $coverageManager = new CodeCoverage();
-
-        // @phpstan-ignore-next-line
-        is_bool(true) && $coverageManager->init($this->options->configuration, $this->codeCoverageFilterRegistry, true);
-
+        $coverageManager->init(
+            $this->options->configuration,
+            $this->codeCoverageFilterRegistry,
+            false,
+        );
         $coverageMerger = new CoverageMerger($coverageManager->codeCoverage());
         foreach ($this->coverageFiles as $coverageFile) {
             $coverageMerger->addCoverageFromFile($coverageFile);
@@ -376,7 +377,7 @@ final class WrapperRunner implements RunnerInterface
         );
     }
 
-    /** @param  array<int, SplFileInfo>  $files */
+    /** @param  list<SplFileInfo>  $files */
     private function clearFiles(array $files): void
     {
         foreach ($files as $file) {
@@ -391,31 +392,19 @@ final class WrapperRunner implements RunnerInterface
     /**
      * Returns the test files to be executed.
      *
-     * @return array<int, string>
+     * @return array<int, non-empty-string>
      */
     private function getTestFiles(SuiteLoader $suiteLoader): array
     {
-        $this->debug(sprintf('Found %d test file%s', count($suiteLoader->files), count($suiteLoader->files) === 1 ? '' : 's'));
-
-        /** @var array<string, string> $files */
-        $files = $suiteLoader->files;
-
-        return [
+        /** @var array<string, non-empty-string> $files */
+        $files = [
             ...array_values(array_filter(
-                $files,
+                $suiteLoader->tests,
                 fn (string $filename): bool => ! str_ends_with($filename, "eval()'d code")
             )),
             ...TestSuite::getInstance()->tests->getFilenames(),
         ];
-    }
 
-    /**
-     * Prints a debug message.
-     */
-    private function debug(string $message): void
-    {
-        if ($this->options->verbose) {
-            $this->output->writeln("  <fg=blue>{$message}</>  ");
-        }
+        return $files; // @phpstan-ignore-line
     }
 }

src/Repositories/BeforeEachRepository.php

@@ -14,27 +14,34 @@ use Pest\Support\NullClosure;
 final class BeforeEachRepository
 {
     /**
-     * @var array<string, Closure>
+     * @var array<string, array{0: Closure, 1: Closure}>
      */
     private array $state = [];
 
     /**
      * Sets a before each closure.
      */
-    public function set(string $filename, Closure $closure): void
+    public function set(string $filename, Closure $beforeEachTestCall, Closure $beforeEachTestCase): void
     {
         if (array_key_exists($filename, $this->state)) {
             throw new BeforeEachAlreadyExist($filename);
         }
 
-        $this->state[$filename] = $closure;
+        $this->state[$filename] = [$beforeEachTestCall, $beforeEachTestCase];
     }
 
     /**
      * Gets a before each closure by the given filename.
+     *
+     * @return array{0: Closure, 1: Closure}
      */
-    public function get(string $filename): Closure
+    public function get(string $filename): array
     {
-        return $this->state[$filename] ?? NullClosure::create();
+        $closures = $this->state[$filename] ?? [];
+
+        return [
+            $closures[0] ?? NullClosure::create(),
+            $closures[1] ?? NullClosure::create(),
+        ];
     }
 }

src/Result.php

@@ -39,15 +39,13 @@ final class Result
      */
     public static function exitCode(Configuration $configuration, TestResult $result): int
     {
-        $returnCode = self::FAILURE_EXIT;
-
         if ($result->wasSuccessfulIgnoringPhpunitWarnings()
             && ! $result->hasTestTriggeredPhpunitWarningEvents()) {
-            $returnCode = self::SUCCESS_EXIT;
+            return self::SUCCESS_EXIT;
         }
 
         if ($configuration->failOnEmptyTestSuite() && $result->numberOfTests() === 0) {
-            $returnCode = self::FAILURE_EXIT;
+            return self::FAILURE_EXIT;
         }
 
         if ($result->wasSuccessfulIgnoringPhpunitWarnings()) {
@@ -76,6 +74,6 @@ final class Result
             return self::EXCEPTION_EXIT;
         }
 
-        return $returnCode;
+        return self::FAILURE_EXIT;
     }
 }

src/Support/Backtrace.php

@@ -104,8 +104,6 @@ final class Backtrace
     {
         $trace = debug_backtrace(self::BACKTRACE_OPTIONS)[1];
 
-        assert(array_key_exists('line', $trace));
-
-        return $trace['line'];
+        return $trace['line'] ?? 0;
     }
 }

src/Support/Coverage.php

@@ -42,6 +42,14 @@ final class Coverage
             return false;
         }
 
+        if ($runtime->hasPCOV()) {
+            return true;
+        }
+
+        if ($runtime->hasPHPDBGCodeCoverage()) {
+            return true;
+        }
+
         if (! $runtime->hasXdebug()) {
             return true;
         }

src/Support/Exporter.php

@@ -77,6 +77,12 @@ final class Exporter
      */
     public function shortenedExport(mixed $value): string
     {
-        return (string) preg_replace(['#\.{3}#', '#\\\n\s*#'], ['…'], $this->exporter->shortenedExport($value));
+        $map = [
+            '#\.{3}#' => '…',
+            '#\\\n\s*#' => '',
+            '# Object \(…\)#' => '',
+        ];
+
+        return (string) preg_replace(array_keys($map), array_values($map), $this->exporter->shortenedExport($value));
     }
 }

src/Support/HigherOrderCallables.php

@@ -25,7 +25,7 @@ final class HigherOrderCallables
      *
      * Create a new expectation. Callable values will be executed prior to returning the new expectation.
      *
-     * @param (Closure():TValue)|TValue $value
+     * @param  (Closure():TValue)|TValue  $value
      * @return Expectation<TValue>
      */
     public function expect(mixed $value): Expectation

src/Support/HigherOrderMessage.php

@@ -62,7 +62,7 @@ final class HigherOrderMessage
             Reflection::setPropertyValue($throwable, 'file', $this->filename);
             Reflection::setPropertyValue($throwable, 'line', $this->line);
 
-            if ($throwable->getMessage() === self::getUndefinedMethodMessage($target, $this->name)) {
+            if ($throwable->getMessage() === $this->getUndefinedMethodMessage($target, $this->name)) {
                 /** @var ReflectionClass<TValue> $reflection */
                 $reflection = new ReflectionClass($target);
                 /* @phpstan-ignore-next-line */
@@ -94,7 +94,7 @@ final class HigherOrderMessage
         return in_array($this->name, get_class_methods(HigherOrderCallables::class), true);
     }
 
-    private static function getUndefinedMethodMessage(object $target, string $methodName): string
+    private function getUndefinedMethodMessage(object $target, string $methodName): string
     {
         if (\PHP_MAJOR_VERSION >= 8) {
             return sprintf(self::UNDEFINED_METHOD, sprintf('%s::%s()', $target::class, $methodName));

tests/.snapshots/Failure.php.inc

@@ -1,7 +1,7 @@
 ##teamcity[testSuiteStarted name='Tests/tests/Failure' locationHint='file://tests/.tests/Failure.php' flowId='1234']
-##teamcity[testCount count='6' flowId='1234']
+##teamcity[testCount count='8' flowId='1234']
 ##teamcity[testStarted name='it can fail with comparison' locationHint='pest_qn://tests/.tests/Failure.php::it can fail with comparison' flowId='1234']
-##teamcity[testFailed name='it can fail with comparison' message='Failed asserting that true matches expected false.' details='at src/Mixins/Expectation.php:343|nat src/Support/ExpectationPipeline.php:75|nat src/Support/ExpectationPipeline.php:79|nat src/Expectation.php:300|nat tests/.tests/Failure.php:6|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:86' type='comparisonFailure' actual='true' expected='false' flowId='1234']
+##teamcity[testFailed name='it can fail with comparison' message='Failed asserting that true matches expected false.' details='at tests/.tests/Failure.php:6' type='comparisonFailure' actual='true' expected='false' flowId='1234']
 ##teamcity[testFinished name='it can fail with comparison' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it can be ignored because of no assertions' locationHint='pest_qn://tests/.tests/Failure.php::it can be ignored because of no assertions' flowId='1234']
 ##teamcity[testIgnored name='it can be ignored because of no assertions' message='This test did not perform any assertions' details='' flowId='1234']
@@ -10,16 +10,21 @@
 ##teamcity[testIgnored name='it can be ignored because it is skipped' message='This test was ignored.' details='' flowId='1234']
 ##teamcity[testFinished name='it can be ignored because it is skipped' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it can fail' locationHint='pest_qn://tests/.tests/Failure.php::it can fail' flowId='1234']
-##teamcity[testFailed name='it can fail' message='oh noo' details='at tests/.tests/Failure.php:18|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:86' flowId='1234']
+##teamcity[testFailed name='it can fail' message='oh noo' details='at tests/.tests/Failure.php:18' flowId='1234']
 ##teamcity[testFinished name='it can fail' duration='100000' flowId='1234']
+##teamcity[testStarted name='it throws exception' locationHint='pest_qn://tests/.tests/Failure.php::it throws exception' flowId='1234']
+##teamcity[testFailed name='it throws exception' message='Exception: test error' details='at tests/.tests/Failure.php:22' flowId='1234']
+##teamcity[testFinished name='it throws exception' duration='100000' flowId='1234']
 ##teamcity[testStarted name='it is not done yet' locationHint='pest_qn://tests/.tests/Failure.php::it is not done yet' flowId='1234']
 ##teamcity[testIgnored name='it is not done yet' message='This test was ignored.' details='' flowId='1234']
 ##teamcity[testFinished name='it is not done yet' duration='100000' flowId='1234']
 ##teamcity[testStarted name='build this one.' locationHint='pest_qn://tests/.tests/Failure.php::build this one.' flowId='1234']
 ##teamcity[testIgnored name='build this one.' message='This test was ignored.' details='' flowId='1234']
 ##teamcity[testFinished name='build this one.' duration='100000' flowId='1234']
+##teamcity[testStarted name='it is passing' locationHint='pest_qn://tests/.tests/Failure.php::it is passing' flowId='1234']
+##teamcity[testFinished name='it is passing' duration='100000' flowId='1234']
 ##teamcity[testSuiteFinished name='Tests/tests/Failure' flowId='1234']
 
-  Tests:    2 failed, 1 risky, 2 todos, 1 skipped (2 assertions)
+  Tests:    3 failed, 1 risky, 2 todos, 1 skipped, 1 passed (3 assertions)
   Duration: 1.00s
 

tests/.snapshots/collision-parallel.txt

@@ -16,7 +16,6 @@
       9▕ })->skip(! isset($_SERVER['COLLISION_TEST']));
 
   1   tests/Fixtures/CollisionTest.php:4
-  2   src/Factories/TestCaseMethodFactory.php:100
 
 
   Tests:    1 failed, 2 passed (2 assertions)

tests/.snapshots/collision.txt

@@ -18,7 +18,6 @@
       9▕ })->skip(! isset($_SERVER['COLLISION_TEST']));
 
   1   tests/Fixtures/CollisionTest.php:4
-  2   src/Factories/TestCaseMethodFactory.php:100
 
 
   Tests:    1 failed, 1 passed (1 assertions)

tests/.snapshots/help-command.txt

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 2.4.0.  
+  Pest Testing Framework 2.8.1.  
 
   USAGE: pest <file> [options]  
 

tests/.snapshots/success.txt

@@ -22,6 +22,22 @@
   ✓ it gets executed before each test
   ✓ it gets executed before each test once again
 
+   PASS  Tests\Features\BeforeEachProxiesToTestCallWithExpectations
+  ✓ runs 1
+  ✓ runs 2
+  ✓ runs 3
+
+   WARN  Tests\Features\BeforeEachProxiesToTestCallWithSkip
+  - does not run 1
+  - does not run 2
+  - does not run 3
+
+   TODO  Tests\Features\BeforeEachProxiesToTestCallWithTodo - 4 todos
+  ↓ is marked as todo 1
+  ↓ is marked as todo 2
+  ↓ is marked as todo 3
+  ↓ shouldBeMarkedAsTodo
+
    WARN  Tests\Features\Coverage
   ✓ it has plugin
   - it adds coverage if --coverage exist → Coverage is not available
@@ -33,6 +49,7 @@
   ✓ it uses the correct PHPUnit attribute for function
   ✓ it removes duplicated attributes
   ✓ it guesses if the given argument is a class or function
+  ✓ it uses the correct PHPUnit attribute for trait
   ✓ it appends CoversNothing to method attributes
   ✓ it does not append CoversNothing to other methods
   ✓ it throws exception if no class nor method has been found
@@ -63,7 +80,7 @@
   ✓ named datasets with dataset "one"
   ✓ named datasets with dataset "two"
   ✓ named datasets did the job right
-  ✓ lazy named datasets with (Bar Object (…))
+  ✓ lazy named datasets with (Bar)
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #1
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #2
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), false)
@@ -117,24 +134,24 @@
   ✓ eager registered wrapped datasets with Generator functions did the job right
   ✓ eager registered wrapped datasets with Generator functions display description with dataset "taylor"
   ✓ eager registered wrapped datasets with Generator functions display description with dataset "james"
-  ✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #1
-  ✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #2
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #1
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #2
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #3
-  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #4
-  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (…)) #1
-  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (…)) #2
-  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (…)) #1
-  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (…)) #2
-  ✓ it resolves a potential bound dataset logically with ('foo', Closure Object (…))
-  ✓ it resolves a potential bound dataset logically even when the closure comes first with (Closure Object (…), 'bar')
-  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure Object (…)) #1
-  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure Object (…)) #2
-  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure Object (…)) #1
-  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure Object (…)) #2
-  ✓ it can correctly resolve a bound dataset that returns an array with (Closure Object (…))
-  ✓ it can correctly resolve a bound dataset that returns an array but wants to be spread with (Closure Object (…))
+  ✓ it can resolve a dataset after the test case is available with (Closure) #1
+  ✓ it can resolve a dataset after the test case is available with (Closure) #2
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #1
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #2
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #3
+  ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure) / (Closure) #4
+  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure) #1
+  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure) #2
+  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure) #1
+  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure) #2
+  ✓ it resolves a potential bound dataset logically with ('foo', Closure)
+  ✓ it resolves a potential bound dataset logically even when the closure comes first with (Closure, 'bar')
+  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure) #1
+  ✓ it will not resolve a closure if it is type hinted as a closure with (Closure) #2
+  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure) #1
+  ✓ it will not resolve a closure if it is type hinted as a callable with (Closure) #2
+  ✓ it can correctly resolve a bound dataset that returns an array with (Closure)
+  ✓ it can correctly resolve a bound dataset that returns an array but wants to be spread with (Closure)
   ↓ forbids to define tests in Datasets dirs and Datasets.php files
 
    PASS  Tests\Features\Depends
@@ -152,8 +169,8 @@
   ✓ it uses correct parent class
 
    DEPR  Tests\Features\Deprecated
-  ! deprecated → str_contains(): Passing null to parameter #2 ($needle) of type string is deprecated // tests/Features/Deprecated.php:6
-  ✓ user deprecated
+  ! deprecated → str_contains(): Passing null to parameter #1 ($haystack) of type string is deprecated // tests/Features/Deprecated.php:6
+  ! user deprecated → Since foo 1.0: This is a deprecation description // vendor/symfony/deprecation-contracts/function.php:25
 
    PASS  Tests\Features\Exceptions
   ✓ it gives access the the underlying expectException
@@ -569,7 +586,7 @@
   ✓ it passes with ('Fortaleza')
   ✓ it passes with ('Sollefteå')
   ✓ it passes with ('Ιεράπετρα')
-  ✓ it passes with (stdClass Object (…))
+  ✓ it passes with (stdClass)
   ✓ it passes with array
   ✓ it passes with *not*
   ✓ it properly fails with *not*
@@ -641,6 +658,7 @@
   ✓ failures 5
   ✓ failures 6
   ✓ failures 7
+  ✓ failures 8
   ✓ failures with custom message
   ✓ not failures
   ✓ closure missing parameter
@@ -790,6 +808,9 @@
    PASS  Tests\Fixtures\ExampleTest
   ✓ it example 2
 
+   WARN  Tests\Fixtures\UnexpectedOutput
+  - output
+
    PASS  Tests\Helpers\TestInHelpers
   ✓ it executes tests in the Helpers directory
 
@@ -845,6 +866,12 @@
   ✓ custom traits can be used
   ✓ trait applied in this file
 
+   PASS  Tests\PHPUnit\GlobPatternTests\SubFolder\InnerFolder\UsesPerDirectoryAsPattern
+  ✓ closure was bound to CustomTestCase
+
+   PASS  Tests\PHPUnit\GlobPatternTests\SubFolder2\UsesPerFileAsPattern
+  ✓ closure was bound to CustomTestCase
+
    PASS  Tests\Playground
   ✓ basic
 
@@ -914,6 +941,9 @@
   ✓ it ensures the given closures reports the correct class name
   ✓ it ensures the given closures reports the correct class name and suggests the [uses()] function
 
+   PASS  Tests\Unit\Support\HigherOrderMessage
+  ✓ undefined method exceptions
+
    PASS  Tests\Unit\Support\Reflection
   ✓ it gets file name from closure
   ✓ it gets property values
@@ -977,6 +1007,7 @@
   ✓ Німеччина
   ✓ Nam Định
   ✓ 呼和浩特
+  ✓ test /** with comment */ should do
 
    PASS  Tests\Unit\TestSuite
   ✓ it does not allow to add the same test description twice
@@ -1016,4 +1047,4 @@
    PASS  Tests\Visual\Version
   ✓ visual snapshot of help command output
 
-  Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 710 passed (1717 assertions)
+  Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 8 todos, 18 skipped, 718 passed (1735 assertions)

tests/.snapshots/todo.txt

@@ -1,3 +1,9 @@
+   TODO  Tests\Features\BeforeEachProxiesToTestCallWithTodo - 4 todos
+  ↓ is marked as todo 1
+  ↓ is marked as todo 2
+  ↓ is marked as todo 3
+  ↓ shouldBeMarkedAsTodo
+
    TODO  Tests\Features\DatasetsTests - 1 todo
   ↓ forbids to define tests in Datasets dirs and Datasets.php files
 
@@ -9,4 +15,4 @@
    PASS  Tests\CustomTestCase\ExecutedTest
   ✓ that gets executed
 
-  Tests:    4 todos, 1 passed (1 assertions)
+  Tests:    8 todos, 1 passed (1 assertions)

tests/.snapshots/version-command.txt

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 2.4.0.  
+  Pest Testing Framework 2.8.1.  
 

tests/.tests/Failure.php

@@ -18,9 +18,17 @@ it('can fail', function () {
     $this->fail("oh noo");
 });
 
+it('throws exception', function () {
+    throw new Exception('test error');
+});
+
 it('is not done yet', function () {
 
 })->todo();
 
 todo("build this one.");
 
+it('is passing', function () {
+    expect(true)->toEqual(true);
+});
+

tests/Features/BeforeEachProxiesToTestCallWithExpectations.php

@@ -0,0 +1,15 @@
+<?php
+
+beforeEach()->expect(true)->toBeTrue();
+
+test('runs 1', function () {
+    // This test did performs assertions...
+});
+
+test('runs 2', function () {
+    // This test did performs assertions...
+});
+
+test('runs 3', function () {
+    // This test did performs assertions...
+});

tests/Features/BeforeEachProxiesToTestCallWithSkip.php

@@ -0,0 +1,15 @@
+<?php
+
+beforeEach()->skip();
+
+test('does not run 1', function () {
+    $this->fail('This test should not run');
+});
+
+test('does not run 2', function () {
+    $this->fail('This test should not run');
+});
+
+test('does not run 3', function () {
+    $this->fail('This test should not run');
+});

tests/Features/BeforeEachProxiesToTestCallWithTodo.php

@@ -0,0 +1,15 @@
+<?php
+
+beforeEach()->todo();
+
+test('is marked as todo 1', function () {
+    $this->fail('This test should not run');
+});
+
+test('is marked as todo 2', function () {
+    $this->fail('This test should not run');
+});
+
+test('is marked as todo 3');
+
+test()->shouldBeMarkedAsTodo();

tests/Features/Covers.php

@@ -6,6 +6,7 @@ use PHPUnit\Framework\Attributes\CoversClass;
 use Tests\Fixtures\Covers\CoversClass1;
 use Tests\Fixtures\Covers\CoversClass2;
 use Tests\Fixtures\Covers\CoversClass3;
+use Tests\Fixtures\Covers\CoversTrait;
 
 $runCounter = 0;
 
@@ -43,6 +44,13 @@ it('guesses if the given argument is a class or function', function () {
     expect($attributes[3]->getArguments()[0])->toBe(CoversClass3::class);
 })->covers(CoversClass3::class, 'testCoversFunction');
 
+it('uses the correct PHPUnit attribute for trait', function () {
+    $attributes = (new ReflectionClass($this))->getAttributes();
+
+    expect($attributes[4]->getName())->toBe('PHPUnit\Framework\Attributes\CoversClass');
+    expect($attributes[4]->getArguments()[0])->toBe('Tests\Fixtures\Covers\CoversTrait');
+})->coversClass(CoversTrait::class);
+
 it('appends CoversNothing to method attributes', function () {
     $phpDoc = (new ReflectionClass($this))->getMethod($this->name());
 

tests/Features/Expect/HigherOrder/methods.php

@@ -85,17 +85,17 @@ it('works with higher order tests')
 it('can use the scoped method to lock into the given level for expectations', function () {
     expect(new HasMethods())
         ->attributes()->scoped(fn ($attributes) => $attributes
-            ->name->toBe('Has Methods')
-            ->quantity->toBe(20)
+        ->name->toBe('Has Methods')
+        ->quantity->toBe(20)
         )
         ->name()->toBeString()->toBe('Has Methods')
         ->newInstance()->newInstance()->scoped(fn ($instance) => $instance
-            ->name()->toBe('Has Methods')
-            ->quantity()->toBe(20)
-            ->attributes()->scoped(fn ($attributes) => $attributes
-                ->name->toBe('Has Methods')
-                ->quantity->toBe(20)
-            )
+        ->name()->toBe('Has Methods')
+        ->quantity()->toBe(20)
+        ->attributes()->scoped(fn ($attributes) => $attributes
+        ->name->toBe('Has Methods')
+        ->quantity->toBe(20)
+        )
         );
 });
 

tests/Features/Expect/pipes.php

@@ -171,19 +171,19 @@ test('pipe works with negated expectation', function () use ($state) {
     $state->reset();
 
     expect($char)->not->toBe(new Char('B'))
-       ->and($state)
-       ->runCount->toMatchArray([
-           'char' => 1,
-           'number' => 0,
-           'wildcard' => 0,
-           'symbol' => 0,
-       ])
-       ->appliedCount->toMatchArray([
-           'char' => 1,
-           'number' => 0,
-           'wildcard' => 0,
-           'symbol' => 0,
-       ]);
+        ->and($state)
+        ->runCount->toMatchArray([
+            'char' => 1,
+            'number' => 0,
+            'wildcard' => 0,
+            'symbol' => 0,
+        ])
+        ->appliedCount->toMatchArray([
+            'char' => 1,
+            'number' => 0,
+            'wildcard' => 0,
+            'symbol' => 0,
+        ]);
 });
 
 test('interceptor is applied', function () use ($state) {

tests/Features/Expect/toThrow.php

@@ -2,6 +2,10 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 
+class CustomException extends Exception
+{
+}
+
 test('passes', function () {
     expect(function () {
         throw new RuntimeException();
@@ -33,6 +37,9 @@ test('passes', function () {
         throw new RuntimeException('actual message');
     })->toThrow(function (RuntimeException $e) {
     }, 'actual message');
+    expect(function () {
+        throw new CustomException('foo');
+    })->toThrow(new CustomException('foo'));
 });
 
 test('failures 1', function () {
@@ -79,6 +86,12 @@ test('failures 7', function () {
     })->toThrow(RuntimeException::class, 'expected message');
 })->throws(ExpectationFailedException::class);
 
+test('failures 8', function () {
+    expect(function () {
+        throw new CustomException('actual message');
+    })->toThrow(new CustomException('expected message'));
+})->throws(ExpectationFailedException::class);
+
 test('failures with custom message', function () {
     expect(function () {
         throw new RuntimeException('actual message');

tests/Fixtures/Covers/CoversTrait.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Tests\Fixtures\Covers;
+
+trait CoversTrait
+{
+}

tests/Fixtures/UnexpectedOutput.php

@@ -0,0 +1,7 @@
+<?php
+
+test('output', function () {
+    echo 'this is unexpected output';
+
+    expect(true)->toBeTrue();
+})->skip(! isset($_SERVER['COLLISION_TEST']));

tests/PHPUnit/GlobPatternTests/SubFolder/InnerFolder/UsesPerDirectoryAsPattern.php

@@ -0,0 +1,5 @@
+<?php
+
+test('closure was bound to CustomTestCase', function () {
+    $this->assertCustomTrue();
+});

tests/PHPUnit/GlobPatternTests/SubFolder2/UsesPerFileAsPattern.php

@@ -0,0 +1,5 @@
+<?php
+
+test('closure was bound to CustomTestCase', function () {
+    $this->assertCustomTrue();
+});

tests/Pest.php

@@ -1,9 +1,16 @@
 <?php
 
+use Tests\CustomTestCase\CustomTestCase;
 use Tests\CustomTestCaseInSubFolders\SubFolder\SubFolder\CustomTestCaseInSubFolder;
 
 uses(CustomTestCaseInSubFolder::class)->in('PHPUnit/CustomTestCaseInSubFolders/SubFolder/SubFolder');
 
+// test case for all the directories inside PHPUnit/GlobPatternTests/SubFolder/
+uses(CustomTestCase::class)->in('PHPUnit/GlobPatternTests/SubFolder/*/');
+
+// test case for all the files that end with AsPattern.php inside PHPUnit/GlobPatternTests/SubFolder2/
+uses(CustomTestCase::class)->in('PHPUnit/GlobPatternTests/SubFolder2/*AsPattern.php');
+
 uses()->group('integration')->in('Visual');
 
 // NOTE: global test value container to be mutated and checked across files, as needed

tests/Unit/Support/HigherOrderMessage.php

@@ -0,0 +1,19 @@
+<?php
+
+use Pest\Support\HigherOrderMessage;
+
+test('undefined method exceptions', function () {
+    $message = new HigherOrderMessage(
+        __FILE__,
+        1,
+        'foqwdqwd',
+        []
+    );
+
+    expect(fn () => $message->call($this))->toThrow(function (ReflectionException $exception) {
+        expect($exception)
+            ->getMessage()->toBe('Call to undefined method PHPUnit\Framework\TestCase::foqwdqwd()')
+            ->getLine()->toBe(1)
+            ->getFile()->toBe(__FILE__);
+    });
+});

tests/Unit/TestName.php

@@ -61,6 +61,7 @@ $names = [
     'Німеччина' => '__pest_evaluable_Німеччина',
     'Nam Định' => '__pest_evaluable_Nam_Định',
     '呼和浩特' => '__pest_evaluable_呼和浩特',
+    'test /** with comment */ should do' => '__pest_evaluable_test_____with_comment____should_do',
 ];
 
 foreach ($names as $name => $methodName) {

tests/Visual/Parallel.php

@@ -18,7 +18,7 @@ $run = function () {
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 698 passed (1702 assertions)')
+        ->toContain('Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 8 todos, 15 skipped, 707 passed (1720 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();
 

tests/Visual/Todo.php

@@ -11,7 +11,9 @@ $run = function (string $target, bool $parallel) {
 
     expect($process->getExitCode())->toBe(0);
 
-    return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+    $outputContent = preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+
+    return $outputContent;
 };
 
 $snapshot = function ($name) {